mirror of
https://github.com/PaperMC/Paper.git
synced 2024-11-22 23:29:32 +01:00
37 lines
2 KiB
Diff
37 lines
2 KiB
Diff
From 2b5e67bf90725c4172e6445deedc4225756994d1 Mon Sep 17 00:00:00 2001
|
|
From: md_5 <git@md-5.net>
|
|
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 2e191a2..7812c76 100644
|
|
--- a/src/main/java/net/minecraft/server/PlayerConnection.java
|
|
+++ b/src/main/java/net/minecraft/server/PlayerConnection.java
|
|
@@ -1703,7 +1703,7 @@ public class PlayerConnection implements PacketListenerPlayIn, IUpdatePlayerList
|
|
|
|
boolean flag1 = packetplayinsetcreativeslot.a() >= 1 && packetplayinsetcreativeslot.a() < 36 + PlayerInventory.getHotbarSize();
|
|
// CraftBukkit - Add invalidItems check
|
|
- boolean flag2 = itemstack == null || itemstack.getItem() != null && !invalidItems.contains(Item.getId(itemstack.getItem()));
|
|
+ boolean flag2 = itemstack == null || itemstack.getItem() != null && (!invalidItems.contains(Item.getId(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
|
|
if (flag || (flag1 && !ItemStack.matches(this.player.defaultContainer.getSlot(packetplayinsetcreativeslot.a()).getItem(), packetplayinsetcreativeslot.getItemStack()))) { // Insist on valid slot
|
|
diff --git a/src/main/java/org/spigotmc/SpigotConfig.java b/src/main/java/org/spigotmc/SpigotConfig.java
|
|
index f58208e..86c45c6 100644
|
|
--- a/src/main/java/org/spigotmc/SpigotConfig.java
|
|
+++ b/src/main/java/org/spigotmc/SpigotConfig.java
|
|
@@ -295,4 +295,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 );
|
|
+ }
|
|
}
|
|
--
|
|
2.1.0
|
|
|