diff options
| author | Thinkofdeath <thinkofdeath@spigotmc.org> | 2014-11-29 21:17:57 +0000 |
|---|---|---|
| committer | Thinkofdeath <thinkofdeath@spigotmc.org> | 2014-11-29 21:17:57 +0000 |
| commit | 9255e9d82c04d590ab2ab019f87cf0dce45a3c54 (patch) | |
| tree | dd5284c94369a62c2ba0a1dad02cfcfd2c87ae17 | |
| parent | bf401fbbde1f434c87f87313f2b7ad16b4b4eb44 (diff) | |
| download | craftbukkit-9255e9d82c04d590ab2ab019f87cf0dce45a3c54.tar craftbukkit-9255e9d82c04d590ab2ab019f87cf0dce45a3c54.tar.gz craftbukkit-9255e9d82c04d590ab2ab019f87cf0dce45a3c54.tar.lz craftbukkit-9255e9d82c04d590ab2ab019f87cf0dce45a3c54.tar.xz craftbukkit-9255e9d82c04d590ab2ab019f87cf0dce45a3c54.zip | |
Fix canceling BlockPlaceEvent
| -rw-r--r-- | nms-patches/ItemStack.patch | 4 | ||||
| -rw-r--r-- | nms-patches/World.patch | 8 |
2 files changed, 6 insertions, 6 deletions
diff --git a/nms-patches/ItemStack.patch b/nms-patches/ItemStack.patch index b6b6b6f4..ecc3c481 100644 --- a/nms-patches/ItemStack.patch +++ b/nms-patches/ItemStack.patch @@ -1,5 +1,5 @@ ---- ../work/decompile-8eb82bde//net/minecraft/server/ItemStack.java 2014-11-28 17:43:43.241707432 +0000 -+++ src/main/java/net/minecraft/server/ItemStack.java 2014-11-28 17:38:20.000000000 +0000 +--- ../work/decompile-8eb82bde//net/minecraft/server/ItemStack.java 2014-11-29 21:16:43.705017876 +0000 ++++ src/main/java/net/minecraft/server/ItemStack.java 2014-11-29 21:16:36.581018034 +0000 @@ -5,6 +5,18 @@ import java.text.DecimalFormat; import java.util.Random; diff --git a/nms-patches/World.patch b/nms-patches/World.patch index 52a949d4..57db4a9e 100644 --- a/nms-patches/World.patch +++ b/nms-patches/World.patch @@ -1,5 +1,5 @@ ---- ../work/decompile-8eb82bde//net/minecraft/server/World.java 2014-11-29 21:08:51.989028346 +0000 -+++ src/main/java/net/minecraft/server/World.java 2014-11-29 21:07:57.617029552 +0000 +--- ../work/decompile-8eb82bde//net/minecraft/server/World.java 2014-11-29 21:17:20.461017061 +0000 ++++ src/main/java/net/minecraft/server/World.java 2014-11-29 21:17:07.617017346 +0000 @@ -13,6 +13,22 @@ import java.util.UUID; import java.util.concurrent.Callable; @@ -53,7 +53,7 @@ + while( blockStateIterator.hasNext() ) { + BlockState blockState1 = blockStateIterator.next(); + if ( blockState1.getLocation().equals( blockState.getLocation() ) ) { -+ blockStateIterator.remove(); ++ return false; + } + } + @@ -141,7 +141,7 @@ if (iblockdata1 == null) { + // CraftBukkit start - remove blockstate if failed -+ if (!this.captureBlockStates) { ++ if (this.captureBlockStates) { + this.capturedBlockStates.remove(blockstate); + } + // CraftBukkit end |