Update to Minecraft 1.8

For more information please see http://www.spigotmc.org/ By: Thinkofdeath <thinkofdeath@spigotmc.org>
2014-11-26 08:32:16 +11:00
parent 2f44d66966
commit a419776f3c
347 changed files with 22151 additions and 1209 deletions
--- a/paper-server/nms-patches/BlockTripwire.patch
+++ b/paper-server/nms-patches/BlockTripwire.patch
@@ -0,0 +1,52 @@
+--- ../work/decompile-bb26c12b/net/minecraft/server/BlockTripwire.java	2014-11-27 08:59:46.585422357 +1100
+++ src/main/java/net/minecraft/server/BlockTripwire.java	2014-11-27 08:42:10.140850934 +1100
+@@ -4,6 +4,8 @@
+ import java.util.List;
+ import java.util.Random;
+ 
+import org.bukkit.event.entity.EntityInteractEvent; // CraftBukkit
+
+ public class BlockTripwire extends Block {
+ 
+     public static final BlockStateBoolean POWERED = BlockStateBoolean.of("powered");
+@@ -154,6 +156,40 @@
+                 }
+             }
+         }
+        
+        // CraftBukkit start - Call interact even when triggering connected tripwire
+        if (flag != flag1 && flag1 && (Boolean)iblockdata.get(ATTACHED)) {
+            org.bukkit.World bworld = world.getWorld();
+            org.bukkit.plugin.PluginManager manager = world.getServer().getPluginManager();
+            org.bukkit.block.Block block = bworld.getBlockAt(blockposition.getX(), blockposition.getY(), blockposition.getZ());
+            boolean allowed = false;
+
+            // If all of the events are cancelled block the tripwire trigger, else allow
+            for (Object object : list) {
+                if (object != null) {
+                    org.bukkit.event.Cancellable cancellable;
+
+                    if (object instanceof EntityHuman) {
+                        cancellable = org.bukkit.craftbukkit.event.CraftEventFactory.callPlayerInteractEvent((EntityHuman) object, org.bukkit.event.block.Action.PHYSICAL, blockposition, null, null);
+                    } else if (object instanceof Entity) {
+                        cancellable = new EntityInteractEvent(((Entity) object).getBukkitEntity(), block);
+                        manager.callEvent((EntityInteractEvent) cancellable);
+                    } else {
+                        continue;
+                    }
+
+                    if (!cancellable.isCancelled()) {
+                        allowed = true;
+                        break;
+                    }
+                }
+            }
+
+            if (!allowed) {
+                return;
+            }
+        }
+        // CraftBukkit end
+ 
+         if (flag1 != flag) {
+             iblockdata = iblockdata.set(BlockTripwire.POWERED, Boolean.valueOf(flag1));