5b4bc3081a
Upstream merge (we must go deeper) SpigotMC/Spigot@1e7bc383c3
26 lines
854 B
Diff
26 lines
854 B
Diff
From 3655091ed2427de66e8fe1bc115b824c47f99404 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 4a40068..3deacc6 100644
|
|
--- a/src/main/java/net/minecraft/server/ItemSkull.java
|
|
+++ b/src/main/java/net/minecraft/server/ItemSkull.java
|
|
@@ -42,6 +42,12 @@ 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;
|
|
|
|
--
|
|
1.9.1
|
|
|