diff --git a/CraftBukkit-Patches/0003-Skeleton-API-Implementations.patch b/CraftBukkit-Patches/0003-Skeleton-API-Implementations.patch index 45b1c1df9e..7a77368180 100644 --- a/CraftBukkit-Patches/0003-Skeleton-API-Implementations.patch +++ b/CraftBukkit-Patches/0003-Skeleton-API-Implementations.patch @@ -1,4 +1,4 @@ -From af542d3375e7b4fa8fed4bca3c6a8460ed1f4257 Mon Sep 17 00:00:00 2001 +From 75dfbcf387efcbb563549aaaa6838a6438f14571 Mon Sep 17 00:00:00 2001 From: md_5 Date: Sun, 2 Jun 2013 15:10:56 +1000 Subject: [PATCH] Skeleton API Implementations @@ -25,10 +25,10 @@ index 629e6b8..4b3fcac 100644 + } } diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java -index 621c89f..20357f9 100644 +index 0d80c41..eb2f6db 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java -@@ -1353,4 +1353,14 @@ public class CraftWorld implements World { +@@ -1357,4 +1357,14 @@ public class CraftWorld implements World { cps.queueUnload(chunk.locX, chunk.locZ); } } diff --git a/CraftBukkit-Patches/0061-Particle-API.patch b/CraftBukkit-Patches/0061-Particle-API.patch index 3aca26960b..dd209521ab 100644 --- a/CraftBukkit-Patches/0061-Particle-API.patch +++ b/CraftBukkit-Patches/0061-Particle-API.patch @@ -1,4 +1,4 @@ -From 46f2bc4a1fa7f46ab1b371eadb9629793ca2044e Mon Sep 17 00:00:00 2001 +From 399bfbc662d9ecfb09fd37ec5f99c3ae6f85fff7 Mon Sep 17 00:00:00 2001 From: Thinkofdeath Date: Fri, 20 Dec 2013 21:36:06 +0000 Subject: [PATCH] Particle API @@ -19,10 +19,10 @@ index 7de0de5..13f9e9d 100644 datavalue = 0; } diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java -index 609b483..5dc77b1 100644 +index f4b2f39..67b6dc3 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java -@@ -822,28 +822,18 @@ public class CraftWorld implements World { +@@ -826,28 +826,18 @@ public class CraftWorld implements World { Validate.isTrue(effect.getData() == null, "Wrong kind of data for this effect!"); } @@ -60,7 +60,7 @@ index 609b483..5dc77b1 100644 } public T spawn(Location location, Class clazz) throws IllegalArgumentException { -@@ -1361,6 +1351,70 @@ public class CraftWorld implements World { +@@ -1365,6 +1355,70 @@ public class CraftWorld implements World { // Spigot start private final Spigot spigot = new Spigot() { diff --git a/CraftBukkit-Patches/0071-Improve-AutoSave-Mechanism.patch b/CraftBukkit-Patches/0071-Improve-AutoSave-Mechanism.patch index 76f38a855a..2037f8d5fb 100644 --- a/CraftBukkit-Patches/0071-Improve-AutoSave-Mechanism.patch +++ b/CraftBukkit-Patches/0071-Improve-AutoSave-Mechanism.patch @@ -1,4 +1,4 @@ -From 1c3c37f03d4a728e40b1c4afecb2c3b1f9ef281b Mon Sep 17 00:00:00 2001 +From f8798f6da120f52aeaaab8905b072637e102e27b Mon Sep 17 00:00:00 2001 From: md_5 Date: Sun, 12 Jan 2014 21:07:18 +1100 Subject: [PATCH] Improve AutoSave Mechanism @@ -47,10 +47,10 @@ index 3dd4201..4c254a7 100644 SpigotTimings.worldSaveTimer.stopTiming(); // Spigot } diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java -index 5dc77b1..62ad47d 100644 +index 67b6dc3..c52b87c 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java -@@ -726,12 +726,17 @@ public class CraftWorld implements World { +@@ -730,12 +730,17 @@ public class CraftWorld implements World { } public void save() { diff --git a/CraftBukkit-Patches/0089-Implement-Silenceable-Lightning-API.patch b/CraftBukkit-Patches/0089-Implement-Silenceable-Lightning-API.patch index edb4dcf95e..87ed00131f 100644 --- a/CraftBukkit-Patches/0089-Implement-Silenceable-Lightning-API.patch +++ b/CraftBukkit-Patches/0089-Implement-Silenceable-Lightning-API.patch @@ -1,4 +1,4 @@ -From 2ce08844e365ba6c3c071e72ff416c395544f160 Mon Sep 17 00:00:00 2001 +From 4bde8a418ed21c9e69acc0cc95477fae9904bcdd Mon Sep 17 00:00:00 2001 From: drXor Date: Sun, 23 Feb 2014 16:16:59 -0400 Subject: [PATCH] Implement Silenceable Lightning API @@ -39,10 +39,10 @@ index d355e68..286fdef 100644 //this.world.makeSound(this.locX, this.locY, this.locZ, "ambient.weather.thunder", 10000.0F, 0.8F + this.random.nextFloat() * 0.2F); float pitch = 0.8F + this.random.nextFloat() * 0.2F; diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java -index 62ad47d..6b26c8f 100644 +index c52b87c..f0bafba 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java -@@ -1420,6 +1420,22 @@ public class CraftWorld implements World { +@@ -1424,6 +1424,22 @@ public class CraftWorld implements World { { CraftWorld.this.playEffect( location, effect, 0 ); } diff --git a/CraftBukkit-Patches/0134-Don-t-spawn-bonus-ocelots-when-plugins-spawn-ocelots.patch b/CraftBukkit-Patches/0134-Don-t-spawn-bonus-ocelots-when-plugins-spawn-ocelots.patch index f4ff65aed4..391520e313 100644 --- a/CraftBukkit-Patches/0134-Don-t-spawn-bonus-ocelots-when-plugins-spawn-ocelots.patch +++ b/CraftBukkit-Patches/0134-Don-t-spawn-bonus-ocelots-when-plugins-spawn-ocelots.patch @@ -1,4 +1,4 @@ -From 7209330109badd45503997b21d6b3807d7c3a0f2 Mon Sep 17 00:00:00 2001 +From 3016caecffd01b7e9372034bd7a917eb19219ee1 Mon Sep 17 00:00:00 2001 From: Thinkofdeath Date: Sat, 19 Jul 2014 12:49:48 +0100 Subject: [PATCH] Don't spawn bonus ocelots when plugins spawn ocelots @@ -26,10 +26,10 @@ index 84c8721..ea5adbe 100644 EntityOcelot entityocelot = new EntityOcelot(this.world); diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java -index 6b26c8f..2bbe104 100644 +index f0bafba..d381fd7 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java -@@ -1092,6 +1092,12 @@ public class CraftWorld implements World { +@@ -1096,6 +1096,12 @@ public class CraftWorld implements World { } if (entity != null) { diff --git a/CraftBukkit-Patches/0155-Use-Standard-List-for-EntitySlices.patch b/CraftBukkit-Patches/0155-Use-Standard-List-for-EntitySlices.patch index aa321b7909..c32a250707 100644 --- a/CraftBukkit-Patches/0155-Use-Standard-List-for-EntitySlices.patch +++ b/CraftBukkit-Patches/0155-Use-Standard-List-for-EntitySlices.patch @@ -1,4 +1,4 @@ -From ca24944ba98f745b47e77fb86cd9911cd07dfa36 Mon Sep 17 00:00:00 2001 +From a91315b617a10e50a22eb0fd1f33433fff9834f7 Mon Sep 17 00:00:00 2001 From: md_5 Date: Fri, 20 Feb 2015 21:33:36 +1100 Subject: [PATCH] Use Standard List for EntitySlices. @@ -85,6 +85,19 @@ index 4e47890..1f6212e 100644 } // CraftBukkit end world.timings.syncChunkLoadEntitiesTimer.startTiming(); // Spigot +diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java +index d381fd7..7a1f2c7 100644 +--- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java ++++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java +@@ -268,7 +268,7 @@ public class CraftWorld implements World { + if (chunk != null) { + // moved from Chunk. + for (int k = 0; k < chunk.entitySlices.length; ++k) { +- chunk.entitySlices[k] = new EntitySlice(net.minecraft.server.Entity.class); ++ chunk.entitySlices[k] = new org.bukkit.craftbukkit.util.UnsafeList(); + } + world.chunkProviderServer.chunks.put(LongHash.toLong(cx, cz), chunk); + diff --git a/src/main/java/org/spigotmc/ActivationRange.java b/src/main/java/org/spigotmc/ActivationRange.java index 0143623..621a717 100644 --- a/src/main/java/org/spigotmc/ActivationRange.java