From 7c5df6b5bb179a5db7d9e751f978ab774043f9b4 Mon Sep 17 00:00:00 2001 From: md_5 Date: Wed, 12 Feb 2014 18:18:07 +1100 Subject: [PATCH] Allow Disabling Creative Item Filter --- ...Allow-Disabling-Creative-Item-Filter.patch | 37 +++++++++++++++++++ 1 file changed, 37 insertions(+) create mode 100644 CraftBukkit-Patches/0112-Allow-Disabling-Creative-Item-Filter.patch diff --git a/CraftBukkit-Patches/0112-Allow-Disabling-Creative-Item-Filter.patch b/CraftBukkit-Patches/0112-Allow-Disabling-Creative-Item-Filter.patch new file mode 100644 index 000000000..ff1da0e89 --- /dev/null +++ b/CraftBukkit-Patches/0112-Allow-Disabling-Creative-Item-Filter.patch @@ -0,0 +1,37 @@ +From e24fa2b4f987811d1fabcb635f7a5904ed3d6fde 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 ddffc96..d23cb7b 100644 +--- a/src/main/java/net/minecraft/server/PlayerConnection.java ++++ b/src/main/java/net/minecraft/server/PlayerConnection.java +@@ -1489,7 +1489,7 @@ public class PlayerConnection implements PacketPlayInListener { + ItemStack itemstack = packetplayinsetcreativeslot.d(); + boolean flag1 = packetplayinsetcreativeslot.c() >= 1 && packetplayinsetcreativeslot.c() < 36 + PlayerInventory.getHotbarSize(); + // CraftBukkit - Add invalidItems check +- boolean flag2 = itemstack == null || itemstack.getItem() != null && !invalidItems.contains(Item.b(itemstack.getItem())); ++ boolean flag2 = itemstack == null || itemstack.getItem() != null && (!invalidItems.contains(Item.b(itemstack.getItem())) || !org.spigotmc.SpigotConfig.filterCreativeItems); // Spigot + boolean flag3 = itemstack == null || itemstack.getData() >= 0 && itemstack.count <= 64 && itemstack.count > 0; + + // CraftBukkit start - Call click event +diff --git a/src/main/java/org/spigotmc/SpigotConfig.java b/src/main/java/org/spigotmc/SpigotConfig.java +index 1a05562..add2b27 100755 +--- a/src/main/java/org/spigotmc/SpigotConfig.java ++++ b/src/main/java/org/spigotmc/SpigotConfig.java +@@ -281,4 +281,10 @@ public class SpigotConfig + { + silentCommandBlocks = getBoolean( "commands.silent-commandblock-console", false ); + } ++ ++ public static boolean filterCreativeItems; ++ private static void filterCreativeItems() ++ { ++ filterCreativeItems = getBoolean( "settings.filter-creative-items", true ); ++ } + } +-- +1.8.3.2 +