Paper/Spigot-Server-Patches/0024-Prevent-tile-entity-and-entity-crashes.patch

67 lines
3.7 KiB
Diff
Raw Normal View History

From 26889dd272c3420365e44b69a9b52eb1e876fdc4 Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
2016-03-01 00:09:49 +01:00
Date: Tue, 1 Mar 2016 23:52:34 -0600
Subject: [PATCH] Prevent tile entity and entity crashes
diff --git a/src/main/java/net/minecraft/server/TileEntity.java b/src/main/java/net/minecraft/server/TileEntity.java
index 68ac014aab..c5212417c6 100644
--- a/src/main/java/net/minecraft/server/TileEntity.java
+++ b/src/main/java/net/minecraft/server/TileEntity.java
@@ -178,7 +178,12 @@ public abstract class TileEntity implements KeyedObject { // Paper
return IRegistry.BLOCK_ENTITY_TYPE.getKey(this.C()) + " // " + this.getClass().getCanonicalName();
2015-03-08 02:16:09 +01:00
});
if (this.world != null) {
- CrashReportSystemDetails.a(crashreportsystemdetails, this.position, this.getBlock());
2016-03-01 00:09:49 +01:00
+ // Paper start - Prevent TileEntity and Entity crashes
+ IBlockData block = this.getBlock();
2015-03-08 02:16:09 +01:00
+ if (block != null) {
+ CrashReportSystemDetails.a(crashreportsystemdetails, this.position, block);
+ }
2016-03-01 00:09:49 +01:00
+ // Paper end
CrashReportSystemDetails.a(crashreportsystemdetails, this.position, this.world.getType(this.position));
}
}
diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
index be2feb441d..0b38093f91 100644
--- a/src/main/java/net/minecraft/server/World.java
+++ b/src/main/java/net/minecraft/server/World.java
@@ -1190,10 +1190,12 @@ public abstract class World implements IEntityAccess, GeneratorAccess, IIBlockAc
2016-03-25 05:59:37 +01:00
entity.tickTimer.stopTiming(); // Paper
} catch (Throwable throwable1) {
2016-03-25 05:59:37 +01:00
entity.tickTimer.stopTiming();
2016-03-01 00:09:49 +01:00
- crashreport1 = CrashReport.a(throwable1, "Ticking entity");
- crashreportsystemdetails1 = crashreport1.a("Entity being ticked");
- entity.appendEntityCrashDetails(crashreportsystemdetails1);
- throw new ReportedException(crashreport1);
+ // Paper start - Prevent tile entity and entity crashes
+ System.err.println("Entity threw exception at " + entity.world.getWorld().getName() + ":" + entity.locX + "," + entity.locY + "," + entity.locZ);
+ throwable1.printStackTrace();
+ entity.dead = true;
+ continue;
2016-03-01 00:09:49 +01:00
+ // Paper end
}
}
@@ -1256,10 +1258,13 @@ public abstract class World implements IEntityAccess, GeneratorAccess, IIBlockAc
((ITickable) tileentity).Y_();
this.methodProfiler.e();
} catch (Throwable throwable2) {
2016-03-01 00:09:49 +01:00
- crashreport1 = CrashReport.a(throwable2, "Ticking block entity");
- crashreportsystemdetails1 = crashreport1.a("Block entity being ticked");
- tileentity.a(crashreportsystemdetails1);
- throw new ReportedException(crashreport1);
2016-03-01 00:09:49 +01:00
+ // Paper start - Prevent tile entity and entity crashes
+ System.err.println("TileEntity threw exception at " + tileentity.world.getWorld().getName() + ":" + tileentity.position.getX() + "," + tileentity.position.getY() + "," + tileentity.position.getZ());
+ throwable2.printStackTrace();
+ tilesThisCycle--;
2016-03-01 00:09:49 +01:00
+ this.tileEntityListTick.remove(tileTickPosition--);
+ continue;
2016-03-01 00:09:49 +01:00
+ // Paper end
}
// Spigot start
finally {
--
2.18.0