Update from upstream SpigotMC

Upstream merge (we must go deeper) SpigotMC/Spigot@1e7bc383c3
2014-08-18 10:43:17 -05:00
parent 706fab83cd
commit b742f7a892
122 changed files with 7 additions and 125 deletions
--- a/CraftBukkit-Patches/0133-Check-Skull-canPlace.patch
+++ b/CraftBukkit-Patches/0133-Check-Skull-canPlace.patch
@@ -0,0 +1,24 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: md_5 <git@md-5.net>
+Date: Tue, 15 Apr 2014 10:48:35 +1000
+Subject: [PATCH] Check Skull canPlace
+
+
+diff --git a/src/main/java/net/minecraft/server/ItemSkull.java b/src/main/java/net/minecraft/server/ItemSkull.java
+index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
+--- a/src/main/java/net/minecraft/server/ItemSkull.java
+++ b/src/main/java/net/minecraft/server/ItemSkull.java
+@@ -0,0 +0,0 @@ public class ItemSkull extends Item {
+             }
+ 
+             if (!world.isStatic) {
+                // Spigot Start
+                if ( !Blocks.SKULL.canPlace( world, i, j, k ) )
+                {
+                    return false;
+                }
+                // Spigot End
+                 world.setTypeAndData(i, j, k, Blocks.SKULL, l, 2);
+                 int i1 = 0;
+ 
+--