From 06e453017fbe9a9de33603c224cedf77655ca8c0 Mon Sep 17 00:00:00 2001 From: Aikar Date: Tue, 22 Mar 2016 01:49:52 -0400 Subject: [PATCH] rebuild patches --- ...allingBlock-and-TNTPrimed-source-location-API.patch | 10 +++++----- .../0101-Optimize-Chunk-Unload-Queue.patch | 8 ++++---- ...tch => 0105-Use-a-Shared-Random-for-Entities.patch} | 2 +- ...s.patch => 0106-Don-t-teleport-dead-entities.patch} | 2 +- ...k-Access.patch => 0107-Optimize-Chunk-Access.patch} | 2 +- 5 files changed, 12 insertions(+), 12 deletions(-) rename Spigot-Server-Patches/{0104-Use-a-Shared-Random-for-Entities.patch => 0105-Use-a-Shared-Random-for-Entities.patch} (95%) rename Spigot-Server-Patches/{0105-Don-t-teleport-dead-entities.patch => 0106-Don-t-teleport-dead-entities.patch} (93%) rename Spigot-Server-Patches/{0106-Optimize-Chunk-Access.patch => 0107-Optimize-Chunk-Access.patch} (98%) 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 ad210f3e7..14047788a 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 efc500c63a06c023dbb9c79c72ec0affd8d7bc1f Mon Sep 17 00:00:00 2001 +From 28bd75dabd3ed085189145006f8d09a99715a093 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)) { diff --git a/Spigot-Server-Patches/0101-Optimize-Chunk-Unload-Queue.patch b/Spigot-Server-Patches/0101-Optimize-Chunk-Unload-Queue.patch index 5a80f1dca..6ce83a3ac 100644 --- a/Spigot-Server-Patches/0101-Optimize-Chunk-Unload-Queue.patch +++ b/Spigot-Server-Patches/0101-Optimize-Chunk-Unload-Queue.patch @@ -1,4 +1,4 @@ -From 32dc972c6b6b45581ad7c5e4090b71a156ead0ed Mon Sep 17 00:00:00 2001 +From 6fdb5fbb0ccfd757fd43069d78c924d3e57837af 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 diff --git a/Spigot-Server-Patches/0104-Use-a-Shared-Random-for-Entities.patch b/Spigot-Server-Patches/0105-Use-a-Shared-Random-for-Entities.patch similarity index 95% rename from Spigot-Server-Patches/0104-Use-a-Shared-Random-for-Entities.patch rename to Spigot-Server-Patches/0105-Use-a-Shared-Random-for-Entities.patch index d3142bc92..09c4b02f9 100644 --- a/Spigot-Server-Patches/0104-Use-a-Shared-Random-for-Entities.patch +++ b/Spigot-Server-Patches/0105-Use-a-Shared-Random-for-Entities.patch @@ -1,4 +1,4 @@ -From 3e395ff227edb3569b55062d798d83d0ac448323 Mon Sep 17 00:00:00 2001 +From 68e6101f346d1c1ffc3053535cd96bede6296790 Mon Sep 17 00:00:00 2001 From: Aikar Date: Tue, 22 Mar 2016 00:33:47 -0400 Subject: [PATCH] Use a Shared Random for Entities diff --git a/Spigot-Server-Patches/0105-Don-t-teleport-dead-entities.patch b/Spigot-Server-Patches/0106-Don-t-teleport-dead-entities.patch similarity index 93% rename from Spigot-Server-Patches/0105-Don-t-teleport-dead-entities.patch rename to Spigot-Server-Patches/0106-Don-t-teleport-dead-entities.patch index ece578941..63098149b 100644 --- a/Spigot-Server-Patches/0105-Don-t-teleport-dead-entities.patch +++ b/Spigot-Server-Patches/0106-Don-t-teleport-dead-entities.patch @@ -1,4 +1,4 @@ -From c1462e2b3643606950a1a9b417a83312fbd0aac7 Mon Sep 17 00:00:00 2001 +From 6b8db7e618c20302d579434a7750410a9ef2aef4 Mon Sep 17 00:00:00 2001 From: Aikar Date: Tue, 22 Mar 2016 00:55:23 -0400 Subject: [PATCH] Don't teleport dead entities diff --git a/Spigot-Server-Patches/0106-Optimize-Chunk-Access.patch b/Spigot-Server-Patches/0107-Optimize-Chunk-Access.patch similarity index 98% rename from Spigot-Server-Patches/0106-Optimize-Chunk-Access.patch rename to Spigot-Server-Patches/0107-Optimize-Chunk-Access.patch index bd16fbffc..0581db7ef 100644 --- a/Spigot-Server-Patches/0106-Optimize-Chunk-Access.patch +++ b/Spigot-Server-Patches/0107-Optimize-Chunk-Access.patch @@ -1,4 +1,4 @@ -From a73987d51afd939b95f45c717a6504098970dcbd Mon Sep 17 00:00:00 2001 +From d52945bca9e8748091ae1f2d8d63118701f011a6 Mon Sep 17 00:00:00 2001 From: Aikar Date: Thu, 27 Aug 2015 01:15:02 -0400 Subject: [PATCH] Optimize Chunk Access