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.
2016-05-27 21:35:28 -04:00
parent 13492455a1
commit fe18b38aea
27 changed files with 63 additions and 115 deletions
--- a/Spigot-Server-Patches/0154-Optimize-EAR.patch
+++ b/Spigot-Server-Patches/0154-Optimize-EAR.patch
@@ -0,0 +1,69 @@
+From bd4875040e0063bc788a902ae367ab7bfaed9aec Mon Sep 17 00:00:00 2001
+From: Aikar <aikar@aikar.co>
+Date: Fri, 13 May 2016 01:38:06 -0400
+Subject: [PATCH] Optimize EAR
+
+
+diff --git a/src/main/java/org/spigotmc/ActivationRange.java b/src/main/java/org/spigotmc/ActivationRange.java
+index ce421eb..a7c4437 100644
+--- a/src/main/java/org/spigotmc/ActivationRange.java
+++ b/src/main/java/org/spigotmc/ActivationRange.java
+@@ -2,6 +2,8 @@ package org.spigotmc;
+ 
+ import java.util.List;
+ import java.util.Set;
+
+import co.aikar.timings.MinecraftTimings;
+ import net.minecraft.server.AxisAlignedBB;
+ import net.minecraft.server.Chunk;
+ import net.minecraft.server.Entity;
+@@ -13,7 +15,7 @@ import net.minecraft.server.EntityCreature;
+ import net.minecraft.server.EntityCreeper;
+ import net.minecraft.server.EntityEnderCrystal;
+ import net.minecraft.server.EntityEnderDragon;
+-import net.minecraft.server.EntityFallingBlock; // Paper
+import net.minecraft.server.EntityFallingBlock;
+ import net.minecraft.server.EntityFireball;
+ import net.minecraft.server.EntityFireworks;
+ import net.minecraft.server.EntityHuman;
+@@ -21,16 +23,15 @@ import net.minecraft.server.EntityLiving;
+ import net.minecraft.server.EntityMonster;
+ import net.minecraft.server.EntityProjectile;
+ import net.minecraft.server.EntitySheep;
+-import net.minecraft.server.EntitySlice;
+ import net.minecraft.server.EntitySlime;
+ import net.minecraft.server.EntityTNTPrimed;
+ import net.minecraft.server.EntityVillager;
+ import net.minecraft.server.EntityWeather;
+ import net.minecraft.server.EntityWither;
+import net.minecraft.server.MCUtil;
+ import net.minecraft.server.MathHelper;
+ import net.minecraft.server.MinecraftServer;
+ import net.minecraft.server.World;
+-import co.aikar.timings.MinecraftTimings;
+ 
+ public class ActivationRange
+ {
+@@ -108,6 +109,7 @@ public class ActivationRange
+         maxRange = Math.max( maxRange, miscActivationRange );
+         maxRange = Math.min( ( world.spigotConfig.viewDistance << 4 ) - 8, maxRange );
+ 
+        Chunk chunk; // Paper
+         for ( EntityHuman player : world.players )
+         {
+ 
+@@ -126,9 +128,9 @@ public class ActivationRange
+             {
+                 for ( int j1 = k; j1 <= l; ++j1 )
+                 {
+-                    if ( world.getWorld().isChunkLoaded( i1, j1 ) )
+                    if ( (chunk = MCUtil.getLoadedChunkWithoutMarkingActive(world, i1, j1 )) != null ) // Paper
+                     {
+-                        activateChunkEntities( world.getChunkAt( i1, j1 ) );
+                        activateChunkEntities( chunk ); // Paper
+                     }
+                 }
+             }
+-- 
+2.7.4 (Apple Git-66)
+