Remove whitelist fix patch, pulled upstream & also slightly incorrect, userCache.a() does not perform a full lookup.

By: md_5 <git@md-5.net>
This commit is contained in:
Spigot
2014-04-15 12:03:38 +10:00
parent 3b83830fde
commit aff3d19f1e
14 changed files with 16 additions and 56 deletions

View File

@@ -1,26 +0,0 @@
From 0cd2a0d0956c136725d42c565bc7d99d35387ea9 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 dd7e5cc..49346a6 100644
--- a/src/main/java/net/minecraft/server/ItemSkull.java
+++ b/src/main/java/net/minecraft/server/ItemSkull.java
@@ -45,6 +45,12 @@ public class ItemSkull extends Item {
if (!world.isStatic) {
// CraftBukkit start - Handle in ItemBlock
// world.setTypeAndData(i, j, k, Blocks.SKULL, l, 2);
+ // Spigot Start
+ if ( !Blocks.SKULL.canPlace( world, i, j, k ) )
+ {
+ return false;
+ }
+ // Spigot End
if (!ItemBlock.processBlockPlace(world, entityhuman, null, i, j, k, Blocks.SKULL, l, clickedX, clickedY, clickedZ)) {
return false;
}
--
1.8.3.2