summaryrefslogtreecommitdiffstats
path: root/src/main/java/net
diff options
context:
space:
mode:
authorStarbuck Johnson <starbuck@modwiz.com>2014-06-24 16:51:36 -0500
committerturt2live <travpc@gmail.com>2014-08-17 11:23:28 -0600
commit3626720d537371277e05891240835b67d46d617e (patch)
treea9ff591d40df9e606a614ac34a9df989893741cc /src/main/java/net
parent4507cec090af201ea73436341933ffd801e521d6 (diff)
downloadcraftbukkit-3626720d537371277e05891240835b67d46d617e.tar
craftbukkit-3626720d537371277e05891240835b67d46d617e.tar.gz
craftbukkit-3626720d537371277e05891240835b67d46d617e.tar.lz
craftbukkit-3626720d537371277e05891240835b67d46d617e.tar.xz
craftbukkit-3626720d537371277e05891240835b67d46d617e.zip
Modify the invalid item set to permit command blocks. Fixes BUKKIT-4342
When using a "vanilla" Minecraft server using the "pick block" key on a command block yields the invoker with a command block within their inventory while in creative mode. Implications of the invalid items set containing the command block also include having a "ghost" item that cannot be placed due to it not actually existing. This commit resolves the problem and brings Craftbukkit closer to vanilla behaviour by removing the command block item ID, 137, from the invalid items set.
Diffstat (limited to 'src/main/java/net')
-rw-r--r--src/main/java/net/minecraft/server/PlayerConnection.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
index c2400201..3a984394 100644
--- a/src/main/java/net/minecraft/server/PlayerConnection.java
+++ b/src/main/java/net/minecraft/server/PlayerConnection.java
@@ -116,7 +116,7 @@ public class PlayerConnection implements PacketPlayInListener {
public CraftPlayer getPlayer() {
return (this.player == null) ? null : (CraftPlayer) this.player.getBukkitEntity();
}
- private final static HashSet<Integer> invalidItems = new HashSet<Integer>(java.util.Arrays.asList(8, 9, 10, 11, 26, 34, 36, 43, 51, 52, 55, 59, 60, 62, 63, 64, 68, 71, 74, 75, 83, 90, 92, 93, 94, 104, 105, 115, 117, 118, 119, 125, 127, 132, 137, 140, 141, 142, 144)); // TODO: Check after every update.
+ private final static HashSet<Integer> invalidItems = new HashSet<Integer>(java.util.Arrays.asList(8, 9, 10, 11, 26, 34, 36, 43, 51, 52, 55, 59, 60, 62, 63, 64, 68, 71, 74, 75, 83, 90, 92, 93, 94, 104, 105, 115, 117, 118, 119, 125, 127, 132, 140, 141, 142, 144)); // TODO: Check after every update.
// CraftBukkit end
public void a() {