From f63f531f42407342b7dfcc63cc786315555c879e Mon Sep 17 00:00:00 2001
From: Zach Brown <1254957+zachbr@users.noreply.github.com>
Date: Sun, 2 Jul 2017 20:54:29 -0500
Subject: [PATCH] Make timings more tolerant of corrupt chunks

Fixes GH-744
---
 Spigot-API-Patches/Timings-v2.patch | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/Spigot-API-Patches/Timings-v2.patch b/Spigot-API-Patches/Timings-v2.patch
index 43557e17b..da467a595 100644
--- a/Spigot-API-Patches/Timings-v2.patch
+++ b/Spigot-API-Patches/Timings-v2.patch
@@ -671,7 +671,7 @@ index 00000000..916b6f9d
 +}
 diff --git a/src/main/java/co/aikar/timings/TimingHistory.java b/src/main/java/co/aikar/timings/TimingHistory.java
 new file mode 100644
-index 00000000..389875b3
+index 00000000..c2c2fb83
 --- /dev/null
 +++ b/src/main/java/co/aikar/timings/TimingHistory.java
 @@ -0,0 +0,0 @@
@@ -787,10 +787,20 @@ index 00000000..389875b3
 +                    RegionData data = regions.get(new RegionId(chunk.getX(), chunk.getZ()));
 +
 +                    for (Entity entity : chunk.getEntities()) {
++                        if (entity == null) {
++                            Bukkit.getLogger().warning("Null entity detected in chunk at position x: " + chunk.getX() + ", z: " + chunk.getZ());
++                            continue;
++                        }
++
 +                        data.entityCounts.get(entity.getType()).increment();
 +                    }
 +
 +                    for (BlockState tileEntity : chunk.getTileEntities()) {
++                        if (tileEntity == null) {
++                            Bukkit.getLogger().warning("Null tileentity detected in chunk at position x: " + chunk.getX() + ", z: " + chunk.getZ());
++                            continue;
++                        }
++
 +                        data.tileEntityCounts.get(tileEntity.getBlock().getType()).increment();
 +                    }
 +                }
@@ -3185,7 +3195,7 @@ index 00000000..5527e7c8
 +
 +}
 diff --git a/src/main/java/org/bukkit/command/SimpleCommandMap.java b/src/main/java/org/bukkit/command/SimpleCommandMap.java
-index cdf838eb..39b275cb 100644
+index 71709126..b886cd82 100644
 --- a/src/main/java/org/bukkit/command/SimpleCommandMap.java
 +++ b/src/main/java/org/bukkit/command/SimpleCommandMap.java
 @@ -0,0 +0,0 @@ public class SimpleCommandMap implements CommandMap {