From a5bb700ee9e9c1fd6f8483ea0fac2321ae5d22e6 Mon Sep 17 00:00:00 2001 From: Byteflux Date: Fri, 10 Jul 2015 03:45:20 -0700 Subject: [PATCH] Remove obsolete patch --- ...ot-filter-out-large-getEntities-call.patch | 27 ------------------- ...s.patch => 0055-Optimize-explosions.patch} | 0 ...owing-block-if-material-has-changed.patch} | 0 ...raining.patch => 0057-Fast-draining.patch} | 0 ...> 0058-Configurable-lava-flow-speed.patch} | 0 ...> 0059-Add-player-view-distance-API.patch} | 0 6 files changed, 27 deletions(-) delete mode 100644 Spigot-Server-Patches/0055-Do-not-filter-out-large-getEntities-call.patch rename Spigot-Server-Patches/{0056-Optimize-explosions.patch => 0055-Optimize-explosions.patch} (100%) rename Spigot-Server-Patches/{0057-Stop-updating-flowing-block-if-material-has-changed.patch => 0056-Stop-updating-flowing-block-if-material-has-changed.patch} (100%) rename Spigot-Server-Patches/{0058-Fast-draining.patch => 0057-Fast-draining.patch} (100%) rename Spigot-Server-Patches/{0059-Configurable-lava-flow-speed.patch => 0058-Configurable-lava-flow-speed.patch} (100%) rename Spigot-Server-Patches/{0060-Add-player-view-distance-API.patch => 0059-Add-player-view-distance-API.patch} (100%) diff --git a/Spigot-Server-Patches/0055-Do-not-filter-out-large-getEntities-call.patch b/Spigot-Server-Patches/0055-Do-not-filter-out-large-getEntities-call.patch deleted file mode 100644 index ea60a91d8..000000000 --- a/Spigot-Server-Patches/0055-Do-not-filter-out-large-getEntities-call.patch +++ /dev/null @@ -1,27 +0,0 @@ -From 37e0a3b799d2042d620798f658a4b1d073b528d4 Mon Sep 17 00:00:00 2001 -From: Byteflux -Date: Tue, 16 Jun 2015 05:30:44 -0700 -Subject: [PATCH] Do not filter out large getEntities call - - -diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java -index 04bc301..3ece597 100644 ---- a/src/main/java/net/minecraft/server/World.java -+++ b/src/main/java/net/minecraft/server/World.java -@@ -2579,13 +2579,6 @@ public abstract class World implements IBlockAccess { - int k = MathHelper.floor((axisalignedbb.c - 2.0D) / 16.0D); - int l = MathHelper.floor((axisalignedbb.f + 2.0D) / 16.0D); - -- // CraftBukkit start - filter out large ranges -- if (j - i > 10 || l - k > 10) { -- getServer().getLogger().log(java.util.logging.Level.WARNING, "Filtered out large getEntities call {0},{1} {2},{3}", new Object[]{i, j, k, j}); -- return arraylist; -- } -- // CraftBukkit end -- - for (int i1 = i; i1 <= j; ++i1) { - for (int j1 = k; j1 <= l; ++j1) { - if (this.isChunkLoaded(i1, j1, true)) { --- -1.9.5.msysgit.1 - diff --git a/Spigot-Server-Patches/0056-Optimize-explosions.patch b/Spigot-Server-Patches/0055-Optimize-explosions.patch similarity index 100% rename from Spigot-Server-Patches/0056-Optimize-explosions.patch rename to Spigot-Server-Patches/0055-Optimize-explosions.patch diff --git a/Spigot-Server-Patches/0057-Stop-updating-flowing-block-if-material-has-changed.patch b/Spigot-Server-Patches/0056-Stop-updating-flowing-block-if-material-has-changed.patch similarity index 100% rename from Spigot-Server-Patches/0057-Stop-updating-flowing-block-if-material-has-changed.patch rename to Spigot-Server-Patches/0056-Stop-updating-flowing-block-if-material-has-changed.patch diff --git a/Spigot-Server-Patches/0058-Fast-draining.patch b/Spigot-Server-Patches/0057-Fast-draining.patch similarity index 100% rename from Spigot-Server-Patches/0058-Fast-draining.patch rename to Spigot-Server-Patches/0057-Fast-draining.patch diff --git a/Spigot-Server-Patches/0059-Configurable-lava-flow-speed.patch b/Spigot-Server-Patches/0058-Configurable-lava-flow-speed.patch similarity index 100% rename from Spigot-Server-Patches/0059-Configurable-lava-flow-speed.patch rename to Spigot-Server-Patches/0058-Configurable-lava-flow-speed.patch diff --git a/Spigot-Server-Patches/0060-Add-player-view-distance-API.patch b/Spigot-Server-Patches/0059-Add-player-view-distance-API.patch similarity index 100% rename from Spigot-Server-Patches/0060-Add-player-view-distance-API.patch rename to Spigot-Server-Patches/0059-Add-player-view-distance-API.patch