geforkt von Mirrors/Paper
Add Player#getFishHook (#7988)
Dieser Commit ist enthalten in:
Ursprung
9d0650ed60
Commit
ed79fc947a
24
patches/api/0387-Add-Player-getFishHook.patch
Normale Datei
24
patches/api/0387-Add-Player-getFishHook.patch
Normale Datei
@ -0,0 +1,24 @@
|
|||||||
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||||||
|
From: u9g <git@u9g.dev>
|
||||||
|
Date: Tue, 14 Jun 2022 19:35:21 -0400
|
||||||
|
Subject: [PATCH] Add Player#getFishHook
|
||||||
|
|
||||||
|
|
||||||
|
diff --git a/src/main/java/org/bukkit/entity/HumanEntity.java b/src/main/java/org/bukkit/entity/HumanEntity.java
|
||||||
|
index f9531c0f909c7caeddfb8f06ef9a11469ba7d434..f854c1252f42ac02ad4eb84f7b5734b4cec88e53 100644
|
||||||
|
--- a/src/main/java/org/bukkit/entity/HumanEntity.java
|
||||||
|
+++ b/src/main/java/org/bukkit/entity/HumanEntity.java
|
||||||
|
@@ -355,6 +355,13 @@ public interface HumanEntity extends LivingEntity, AnimalTamer, InventoryHolder
|
||||||
|
@Nullable
|
||||||
|
public Location getPotentialBedLocation();
|
||||||
|
// Paper end
|
||||||
|
+ // Paper start
|
||||||
|
+ /**
|
||||||
|
+ * @return the player's fishing hook if they are fishing
|
||||||
|
+ */
|
||||||
|
+ @Nullable
|
||||||
|
+ FishHook getFishHook();
|
||||||
|
+ // Paper end
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Attempts to make the entity sleep at the given location.
|
26
patches/server/0920-Add-Player-getFishHook.patch
Normale Datei
26
patches/server/0920-Add-Player-getFishHook.patch
Normale Datei
@ -0,0 +1,26 @@
|
|||||||
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||||||
|
From: u9g <git@u9g.dev>
|
||||||
|
Date: Tue, 14 Jun 2022 19:36:10 -0400
|
||||||
|
Subject: [PATCH] Add Player#getFishHook
|
||||||
|
|
||||||
|
|
||||||
|
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java
|
||||||
|
index 6149e74262ca6c4c00686a89c273c59bfaac3e05..c0a7b7bb9757de55424188629087d2ec82479e3c 100644
|
||||||
|
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java
|
||||||
|
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java
|
||||||
|
@@ -150,6 +150,15 @@ public class CraftHumanEntity extends CraftLivingEntity implements HumanEntity {
|
||||||
|
return new Location(worldServer.getWorld(), bed.getX(), bed.getY(), bed.getZ());
|
||||||
|
}
|
||||||
|
// Paper end
|
||||||
|
+ // Paper start
|
||||||
|
+ @Override
|
||||||
|
+ public org.bukkit.entity.FishHook getFishHook() {
|
||||||
|
+ if (getHandle().fishing == null) {
|
||||||
|
+ return null;
|
||||||
|
+ }
|
||||||
|
+ return (org.bukkit.entity.FishHook) getHandle().fishing.getBukkitEntity();
|
||||||
|
+ }
|
||||||
|
+ // Paper end
|
||||||
|
@Override
|
||||||
|
public boolean sleep(Location location, boolean force) {
|
||||||
|
Preconditions.checkArgument(location != null, "Location cannot be null");
|
Laden…
In neuem Issue referenzieren
Einen Benutzer sperren