mirror of https://github.com/PaperMC/Paper.git
28 lines
1.0 KiB
Diff
28 lines
1.0 KiB
Diff
From 12c06cd7b3eb049c7e2a170566a9f72c96f29d17 Mon Sep 17 00:00:00 2001
|
|
From: md_5 <md_5@live.com.au>
|
|
Date: Sun, 3 Feb 2013 09:20:19 +1100
|
|
Subject: [PATCH] Handle Null Tile Entities
|
|
|
|
|
|
diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
|
|
index 40a3fcf..3e93cfd 100644
|
|
--- a/src/main/java/net/minecraft/server/World.java
|
|
+++ b/src/main/java/net/minecraft/server/World.java
|
|
@@ -1374,6 +1374,13 @@ public abstract class World implements IBlockAccess {
|
|
|
|
while (iterator.hasNext()) {
|
|
TileEntity tileentity = (TileEntity) iterator.next();
|
|
+ // Spigot start
|
|
+ if (tileentity == null) {
|
|
+ getServer().getLogger().severe("Spigot has detected a null entity and has removed it, preventing a crash");
|
|
+ iterator.remove();
|
|
+ continue;
|
|
+ }
|
|
+ // Spigot end
|
|
|
|
if (!tileentity.r() && tileentity.o() && this.isLoaded(tileentity.x, tileentity.y, tileentity.z)) {
|
|
try {
|
|
--
|
|
1.9.1
|
|
|