diff --git a/CraftBukkit-Patches/0014-Entity-Activation-Range.patch b/CraftBukkit-Patches/0014-Entity-Activation-Range.patch index d955b73614..07c0511644 100644 --- a/CraftBukkit-Patches/0014-Entity-Activation-Range.patch +++ b/CraftBukkit-Patches/0014-Entity-Activation-Range.patch @@ -1,4 +1,4 @@ -From e0a355fa36a67765444ee9fd9136ae31382e615c Mon Sep 17 00:00:00 2001 +From 279f8e96072730a4c8b597d7d763cf54d61b5629 Mon Sep 17 00:00:00 2001 From: Aikar Date: Sun, 3 Feb 2013 05:10:21 -0500 Subject: [PATCH] Entity Activation Range @@ -228,7 +228,7 @@ index 558574f..41d2d87 100644 public static final HashMap pluginTaskTimingMap = new HashMap(); diff --git a/src/main/java/org/spigotmc/ActivationRange.java b/src/main/java/org/spigotmc/ActivationRange.java new file mode 100644 -index 0000000..70d8ab1 +index 0000000..c4364cd --- /dev/null +++ b/src/main/java/org/spigotmc/ActivationRange.java @@ -0,0 +1,286 @@ @@ -427,7 +427,7 @@ index 0000000..70d8ab1 + } + if ( !( entity instanceof EntityArrow ) ) + { -+ if ( !entity.onGround || !entity.passengers.isEmpty() || entity.getVehicle()!= null ) ++ if ( !entity.onGround || !entity.passengers.isEmpty() || entity.isPassenger() ) + { + return true; + } diff --git a/CraftBukkit-Patches/0074-Allow-Disabling-Creative-Item-Filter.patch b/CraftBukkit-Patches/0074-Allow-Disabling-Creative-Item-Filter.patch index 379ba60449..92603e2ead 100644 --- a/CraftBukkit-Patches/0074-Allow-Disabling-Creative-Item-Filter.patch +++ b/CraftBukkit-Patches/0074-Allow-Disabling-Creative-Item-Filter.patch @@ -1,14 +1,14 @@ -From 0a694a65a56becdefe1a82df4e7efc077e4b803b Mon Sep 17 00:00:00 2001 +From 20d67b6173f1cc8238c953b1cf510dbb4255b4a6 Mon Sep 17 00:00:00 2001 From: md_5 Date: Wed, 12 Feb 2014 18:18:01 +1100 Subject: [PATCH] Allow Disabling Creative Item Filter diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java -index 859ddf0..c52eeae 100644 +index 0596a2e..7698e6d 100644 --- a/src/main/java/net/minecraft/server/PlayerConnection.java +++ b/src/main/java/net/minecraft/server/PlayerConnection.java -@@ -1902,7 +1902,7 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable { +@@ -1904,7 +1904,7 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable { boolean flag1 = packetplayinsetcreativeslot.a() >= 1 && packetplayinsetcreativeslot.a() <= 45; // CraftBukkit - Add invalidItems check