19972e09b8
5a0150f586ed3eb15fe6f1f596d1a5a7d806f0f9 Fix ITEM_BREAK e6a3911057bd94d8bd7021cbb4923fb84fb106d1 Upstream merge d1cdcf8d4c3639f956474f02ed662517cffbe23e Remove old patch 068df64aeee368377e1673667bffc7a6dcf90554 Rebuild all patches
26 lines
987 B
Diff
26 lines
987 B
Diff
From 56989d31da36775b31523b8aeaf811262bcef094 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 75763ab..7f727f5 100644
|
|
--- a/src/main/java/net/minecraft/server/ItemSkull.java
|
|
+++ b/src/main/java/net/minecraft/server/ItemSkull.java
|
|
@@ -35,6 +35,12 @@ public class ItemSkull extends Item {
|
|
return false;
|
|
} else {
|
|
if (!world.isStatic) {
|
|
+ // Spigot Start
|
|
+ if ( !Blocks.SKULL.canPlace( world, blockposition ) )
|
|
+ {
|
|
+ return false;
|
|
+ }
|
|
+ // Spigot End
|
|
world.setTypeAndData(blockposition, Blocks.SKULL.getBlockData().set(BlockSkull.FACING, enumdirection), 3);
|
|
int i = 0;
|
|
|
|
--
|
|
2.1.0
|
|
|