Remove unneeded mob spawn cap patch - Fixes #235

I misread the code and thought the code kept looping until the mob spawn cap was hit.

Upon furthur review, this is not true, so this patch doesn't do anything sane.

1 files changed, 0 insertions, 49 deletions

diff --git a/Spigot-Server-Patches/0158-Avoid-blocking-on-Network-Manager-creation.patch b/Spigot-Server-Patches/0158-Avoid-blocking-on-Network-Manager-creation.patch
deleted file mode 100644
index a685b234c6..0000000000
--- a/Spigot-Server-Patches/0158-Avoid-blocking-on-Network-Manager-creation.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-From 35daee4c95827a178f1f80c336d4e100f64fa91f Mon Sep 17 00:00:00 2001
-From: Aikar <[email protected]>
-Date: Mon, 16 May 2016 23:19:16 -0400
-Subject: [PATCH] Avoid blocking on Network Manager creation
-
-Per Paper issue 294
-
-diff --git a/src/main/java/net/minecraft/server/ServerConnection.java b/src/main/java/net/minecraft/server/ServerConnection.java
-index 4ab28e6..08634c3 100644
---- a/src/main/java/net/minecraft/server/ServerConnection.java
-+++ b/src/main/java/net/minecraft/server/ServerConnection.java
-@@ -60,6 +60,17 @@ public class ServerConnection {
-     public volatile boolean d;
-     private final List<ChannelFuture> g = Collections.synchronizedList(Lists.<ChannelFuture>newArrayList());
-     private final List<NetworkManager> h = Collections.synchronizedList(Lists.<NetworkManager>newArrayList());
-+    // Paper start - prevent blocking on adding a new network manager while the server is ticking
-+    private final List<NetworkManager> pending = Collections.synchronizedList(Lists.<NetworkManager>newArrayList());
-+    private void addPending() {
-+        synchronized (pending) {
-+            synchronized (this.h) { // Paper // OBFHELPER - List of network managers
-+                this.h.addAll(pending);
-+                pending.clear();
-+            }
-+        }
-+    }
-+    // Paper end
- 
-     public ServerConnection(MinecraftServer minecraftserver) {
-         this.f = minecraftserver;
-@@ -94,7 +105,7 @@ public class ServerConnection {
-                     channel.pipeline().addLast("timeout", new ReadTimeoutHandler(30)).addLast("legacy_query", new LegacyPingHandler(ServerConnection.this)).addLast("splitter", new PacketSplitter()).addLast("decoder", new PacketDecoder(EnumProtocolDirection.SERVERBOUND)).addLast("prepender", new PacketPrepender()).addLast("encoder", new PacketEncoder(EnumProtocolDirection.CLIENTBOUND));
-                     NetworkManager networkmanager = new NetworkManager(EnumProtocolDirection.SERVERBOUND);
- 
--                    ServerConnection.this.h.add(networkmanager);
-+                    pending.add(networkmanager); // Paper
-                     channel.pipeline().addLast("packet_handler", networkmanager);
-                     networkmanager.setPacketListener(new HandshakeListener(ServerConnection.this.f, networkmanager));
-                 }
-@@ -123,6 +134,7 @@ public class ServerConnection {
- 
-         synchronized (this.h) {
-             // Spigot Start
-+            addPending(); // Paper
-             // This prevents players from 'gaming' the server, and strategically relogging to increase their position in the tick order
-             if ( org.spigotmc.SpigotConfig.playerShuffle > 0 && MinecraftServer.currentTick % org.spigotmc.SpigotConfig.playerShuffle == 0 )
-             {
--- 
-2.8.2
-