SteamWar/Paper
10
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

SPIGOT-465: Allow cancelling BlockPlaceEvent to preven wither spawns

Browse Source 
By: Thinkofdeath <thinkofdeath@spigotmc.org>
This commit is contained in:
CraftBukkit/Spigot
2015-02-02 21:55:33 +00:00
parent 0a6de53abf
commit 4dd6d9a450
2 changed files with 36 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
paper-server/nms-patches/BlockSkull.patch
View File

@@ -1,5 +1,5 @@
--- ../work/decompile-8eb82bde//net/minecraft/server/BlockSkull.java 2014-11-28 17:43:42.961707438 +0000
+++ src/main/java/net/minecraft/server/BlockSkull.java 2014-11-28 17:38:23.000000000 +0000
--- ../work/decompile-8eb82bde//net/minecraft/server/BlockSkull.java 2015-02-02 21:55:13.808077826 +0000
+++ src/main/java/net/minecraft/server/BlockSkull.java 2015-02-02 21:55:13.808077826 +0000
@@ -4,6 +4,11 @@
import java.util.Iterator;
import java.util.Random;
@@ -51,7 +51,13 @@
TileEntity tileentity = world.getTileEntity(blockposition);
if (tileentity instanceof TileEntitySkull) {
@@ -120,19 +145,30 @@
@@ -115,24 +140,36 @@
}
public void a(World world, BlockPosition blockposition, TileEntitySkull tileentityskull) {
+ if (world.captureBlockStates) return; // CraftBukkit
if (tileentityskull.getSkullType() == 1 && blockposition.getY() >= 2 && world.getDifficulty() != EnumDifficulty.PEACEFUL && !world.isStatic) {
ShapeDetector shapedetector = this.l();
ShapeDetectorCollection shapedetectorcollection = shapedetector.a(world, blockposition);
if (shapedetectorcollection != null) {
@@ -84,7 +90,7 @@
}
}
@@ -145,28 +181,31 @@
@@ -145,28 +182,31 @@
entitywither.n();
Iterator iterator = world.a(EntityHuman.class, entitywither.getBoundingBox().grow(50.0D, 50.0D, 50.0D)).iterator();