From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Mark Vainomaa Date: Sun, 1 Apr 2018 02:29:37 +0300 Subject: [PATCH] Add openSign method to HumanEntity diff --git a/src/main/java/org/bukkit/craftbukkit/block/CraftSign.java b/src/main/java/org/bukkit/craftbukkit/block/CraftSign.java index cc6aab5341365f9b4ec3cb23e2a4f5006aa75cd7..79d65cd38fea160cf8c3b4b8c32bb62740f18c9a 100644 --- a/src/main/java/org/bukkit/craftbukkit/block/CraftSign.java +++ b/src/main/java/org/bukkit/craftbukkit/block/CraftSign.java @@ -110,15 +110,15 @@ public class CraftSign extends CraftBlockEntityState< super.applyTo(sign); } - public static void openSign(Sign sign, Player player, Side side) { + public static void openSign(Sign sign, org.bukkit.entity.HumanEntity player, Side side) { // Paper - change move open sign to HumanEntity Preconditions.checkArgument(sign != null, "sign == null"); Preconditions.checkArgument(side != null, "side == null"); - Preconditions.checkArgument(sign.isPlaced(), "Sign must be placed"); + // Preconditions.checkArgument(sign.isPlaced(), "Sign must be placed"); // Paper - don't require placed Preconditions.checkArgument(sign.getWorld() == player.getWorld(), "Sign must be in same world as Player"); SignBlockEntity handle = ((CraftSign) sign).getTileEntity(); - ((CraftPlayer) player).getHandle().openTextEdit(handle, Side.FRONT == side); + ((org.bukkit.craftbukkit.entity.CraftHumanEntity) player).getHandle().openTextEdit(handle, Side.FRONT == side); // Paper - change move open sign to HumanEntity } // Paper start diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java index c6b2f1b90735ec75492daf64031d9d33226cdac6..db27f88cc2fcb2835a5ef03519c75a176426b9fa 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java @@ -628,6 +628,12 @@ public class CraftHumanEntity extends CraftLivingEntity implements HumanEntity { } } + // Paper start - move open sign method to HumanEntity + @Override + public void openSign(org.bukkit.block.Sign sign) { + org.bukkit.craftbukkit.block.CraftSign.openSign(sign, this); + } + // Paper end @Override public boolean dropItem(boolean dropAll) { if (!(this.getHandle() instanceof ServerPlayer)) return false;