From 67fb7e9f66f20bf7a3a3f033fe92bba3968bd27d Mon Sep 17 00:00:00 2001
From: Colin Godsey <crgodsey@gmail.com>
Date: Wed, 15 Aug 2018 15:07:30 -0600
Subject: [PATCH] pr changes, flat array

---
 Spigot-Server-Patches/Add-entity-count-cache.patch | 14 +++++---------
 1 file changed, 5 insertions(+), 9 deletions(-)

diff --git a/Spigot-Server-Patches/Add-entity-count-cache.patch b/Spigot-Server-Patches/Add-entity-count-cache.patch
index ee1854e4af..e41589d0ce 100644
--- a/Spigot-Server-Patches/Add-entity-count-cache.patch
+++ b/Spigot-Server-Patches/Add-entity-count-cache.patch
@@ -52,7 +52,7 @@ index f525fd1b4..494759a1c 100644
  
                      if (k <= l1) {
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index 004c3ec47..dc301c6f4 100644
+index 004c3ec47..e2d591f8f 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
 @@ -0,0 +0,0 @@ import java.util.Iterator;
@@ -118,18 +118,14 @@ index 004c3ec47..dc301c6f4 100644
      }
  
 +    // Paper start - entity count cache
-+    private Map<EnumCreatureType, Integer> countCache = new EnumMap(EnumCreatureType.class);
++    private final int[] countCache = new int[EnumCreatureType.values().length];
 +
 +    public int getCreatureCount(EnumCreatureType type) {
-+        Integer count = countCache.get(type);
-+
-+        return count == null ? 0 : count;
++        return countCache[type.ordinal()];
 +    }
 +
 +    protected void updateEntityCount(EnumCreatureType type, boolean incr) {
-+        Integer countObject = countCache.get(type);
-+
-+        int count = countObject == null ? 0 : countObject;
++        int count = countCache[type.ordinal()];
 +
 +        if (incr) count++;
 +        else count--;
@@ -139,7 +135,7 @@ index 004c3ec47..dc301c6f4 100644
 +            count = 0;
 +        }
 +
-+        countCache.put(type, count);
++        countCache[type.ordinal()] = count;
 +    }
 +
 +    protected void updateEntityCount(Entity entity, boolean incr) {