diff --git a/Patches/CraftBukkit-Patches/0179-md_5-s-player-interaction-for-specs-patch.patch b/Patches/CraftBukkit-Patches/0179-md_5-s-player-interaction-for-specs-patch.patch new file mode 100644 index 000000000..8ef283ea6 --- /dev/null +++ b/Patches/CraftBukkit-Patches/0179-md_5-s-player-interaction-for-specs-patch.patch @@ -0,0 +1,31 @@ +From 3d0c2e6b1409ca0c42b7aafbffae4b517d7db48c Mon Sep 17 00:00:00 2001 +From: libraryaddict +Date: Fri, 29 Jan 2016 16:59:00 +1300 +Subject: [PATCH] md_5's player interaction for specs patch + + +diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java +index d3b1586..6fd49b3 100644 +--- a/src/main/java/net/minecraft/server/PlayerConnection.java ++++ b/src/main/java/net/minecraft/server/PlayerConnection.java +@@ -1206,6 +1206,17 @@ public class PlayerConnection implements PacketListenerPlayIn, IUpdatePlayerList + if (movingobjectposition == null || movingobjectposition.type != MovingObjectPosition.EnumMovingObjectType.BLOCK) { + CraftEventFactory.callPlayerInteractEvent(this.player, Action.LEFT_CLICK_AIR, this.player.inventory.getItemInHand()); + } ++ // Spigot start ++ else if (movingobjectposition.type == MovingObjectPosition.EnumMovingObjectType.BLOCK ++ && (player.playerInteractManager.getGameMode() == WorldSettings.EnumGamemode.ADVENTURE || player.playerInteractManager.getGameMode() == WorldSettings.EnumGamemode.SPECTATOR)) { ++ // RIGHT_CLICK_BLOCK sets this flag ++ if (player.playerInteractManager.firedInteract) { ++ player.playerInteractManager.firedInteract = false; ++ } else { ++ CraftEventFactory.callPlayerInteractEvent(this.player, Action.LEFT_CLICK_BLOCK, movingobjectposition.a(), movingobjectposition.direction, player.inventory.getItemInHand(), true); ++ } ++ } ++ // Spigot end + + // Arm swing animation + PlayerAnimationEvent event = new PlayerAnimationEvent(this.getPlayer()); +-- +1.9.5.msysgit.0 + diff --git a/Patches/CraftBukkit-Patches/0180-Fix-enderman-teleporting-when-vegetated.patch b/Patches/CraftBukkit-Patches/0180-Fix-enderman-teleporting-when-vegetated.patch new file mode 100644 index 000000000..dc539b4a4 --- /dev/null +++ b/Patches/CraftBukkit-Patches/0180-Fix-enderman-teleporting-when-vegetated.patch @@ -0,0 +1,25 @@ +From c0e8d43f419d7f489cd0ae348618f897e95b0402 Mon Sep 17 00:00:00 2001 +From: libraryaddict +Date: Fri, 29 Jan 2016 16:59:12 +1300 +Subject: [PATCH] Fix enderman teleporting when vegetated + + +diff --git a/src/main/java/net/minecraft/server/EntityEnderman.java b/src/main/java/net/minecraft/server/EntityEnderman.java +index a250062..5ad2d07 100644 +--- a/src/main/java/net/minecraft/server/EntityEnderman.java ++++ b/src/main/java/net/minecraft/server/EntityEnderman.java +@@ -157,6 +157,11 @@ public class EntityEnderman extends EntityMonster { + } + + protected boolean k(double d0, double d1, double d2) { ++ if (isVegetated()) ++ { ++ return false; ++ } ++ + double d3 = this.locX; + double d4 = this.locY; + double d5 = this.locZ; +-- +1.9.5.msysgit.0 + diff --git a/Plugins/Libraries/craftbukkit.jar b/Plugins/Libraries/craftbukkit.jar index fcd6fc5b3..c7cb7fa92 100644 Binary files a/Plugins/Libraries/craftbukkit.jar and b/Plugins/Libraries/craftbukkit.jar differ