From f5eb0e04bc226770241aa0cc3db3f80a81108a72 Mon Sep 17 00:00:00 2001 From: Aikar Date: Thu, 24 Mar 2016 20:29:40 -0400 Subject: [PATCH] rebuild --- ...lingBlock-and-TNTPrimed-source-location-API.patch | 12 ++++++------ .../0100-Optimize-Chunk-Unload-Queue.patch | 8 ++++---- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/Spigot-Server-Patches/0024-FallingBlock-and-TNTPrimed-source-location-API.patch b/Spigot-Server-Patches/0024-FallingBlock-and-TNTPrimed-source-location-API.patch index f7d17da133..4a828fd391 100644 --- a/Spigot-Server-Patches/0024-FallingBlock-and-TNTPrimed-source-location-API.patch +++ b/Spigot-Server-Patches/0024-FallingBlock-and-TNTPrimed-source-location-API.patch @@ -1,4 +1,4 @@ -From af0bb23539f7b7fe93dc54d56c372f8c6e29ff84 Mon Sep 17 00:00:00 2001 +From c7b2b2ddcf7ac61c50fb7b69772e49b430a7f983 Mon Sep 17 00:00:00 2001 From: Byteflux Date: Tue, 1 Mar 2016 23:45:08 -0600 Subject: [PATCH] FallingBlock and TNTPrimed source location API @@ -193,10 +193,10 @@ index 564ea37..1820c7b 100644 public EntityLiving getSource() { diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java -index 83e3003..25edfb8 100644 +index a487c2f..33c3428 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java -@@ -921,7 +921,10 @@ public class CraftWorld implements World { +@@ -916,7 +916,10 @@ public class CraftWorld implements World { double y = location.getBlockY() + 0.5; double z = location.getBlockZ() + 0.5; @@ -208,7 +208,7 @@ index 83e3003..25edfb8 100644 entity.ticksLived = 1; world.addEntity(entity, SpawnReason.CUSTOM); -@@ -957,7 +960,10 @@ public class CraftWorld implements World { +@@ -952,7 +955,10 @@ public class CraftWorld implements World { int type = CraftMagicNumbers.getId(blockData.getBlock()); int data = blockData.getBlock().toLegacyData(blockData); @@ -220,7 +220,7 @@ index 83e3003..25edfb8 100644 } else if (Projectile.class.isAssignableFrom(clazz)) { if (Snowball.class.isAssignableFrom(clazz)) { entity = new EntitySnowball(world, x, y, z); -@@ -1162,7 +1168,8 @@ public class CraftWorld implements World { +@@ -1157,7 +1163,8 @@ public class CraftWorld implements World { throw new IllegalArgumentException("Cannot spawn hanging entity for " + clazz.getName() + " at " + location); } } else if (TNTPrimed.class.isAssignableFrom(clazz)) { @@ -263,5 +263,5 @@ index c493c9c..eea3238 100644 + // Paper end } -- -2.7.4.windows.1 +2.7.4 diff --git a/Spigot-Server-Patches/0100-Optimize-Chunk-Unload-Queue.patch b/Spigot-Server-Patches/0100-Optimize-Chunk-Unload-Queue.patch index 87602013e5..a204b4963c 100644 --- a/Spigot-Server-Patches/0100-Optimize-Chunk-Unload-Queue.patch +++ b/Spigot-Server-Patches/0100-Optimize-Chunk-Unload-Queue.patch @@ -1,4 +1,4 @@ -From b16e2e2a056abedb2e964e6e386fbb7cb57f3b6a Mon Sep 17 00:00:00 2001 +From fe5e6a8d13715121e59f1b96e123c54174144e29 Mon Sep 17 00:00:00 2001 From: Aikar Date: Fri, 18 Mar 2016 17:57:25 -0400 Subject: [PATCH] Optimize Chunk Unload Queue @@ -261,7 +261,7 @@ index a6c8e53..d8bd36c 100644 this.spigotConfig = new org.spigotmc.SpigotWorldConfig( worlddata.getName() ); // Spigot this.paperConfig = new com.destroystokyo.paper.PaperWorldConfig(worlddata.getName(), this.spigotConfig); // Paper diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java -index c51c74b..caa5e62 100644 +index be311cd..6307c19 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java @@ -206,7 +206,7 @@ public class CraftWorld implements World { @@ -299,7 +299,7 @@ index c51c74b..caa5e62 100644 if (neighbor != null) { neighbor.setNeighborLoaded(-x, -z); chunk.setNeighborLoaded(x, z); -@@ -1543,7 +1544,7 @@ public class CraftWorld implements World { +@@ -1538,7 +1539,7 @@ public class CraftWorld implements World { } // Already unloading? @@ -348,5 +348,5 @@ index daed1db..e4af40c 100644 { isActive = false; -- -2.7.4.windows.1 +2.7.4