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

67 lines
3.6 KiB
Diff
Raw Normal View History

2017-04-22 06:16:45 +00:00
From d19627bd77a6f4f3b3360d3ba224224b206344ce Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
2016-02-29 23:09:49 +00: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 b3d3df4cf..d0c0371fc 100644
--- a/src/main/java/net/minecraft/server/TileEntity.java
+++ b/src/main/java/net/minecraft/server/TileEntity.java
2016-11-17 02:23:38 +00:00
@@ -175,7 +175,12 @@ public abstract class TileEntity {
2015-03-08 01:16:09 +00:00
}
});
if (this.world != null) {
2016-11-17 02:23:38 +00:00
- CrashReportSystemDetails.a(crashreportsystemdetails, this.position, this.getBlock(), this.v());
2016-02-29 23:09:49 +00:00
+ // Paper start - Prevent TileEntity and Entity crashes
+ Block block = this.getBlock();
2015-03-08 01:16:09 +00:00
+ if (block != null) {
2016-11-17 02:23:38 +00:00
+ CrashReportSystemDetails.a(crashreportsystemdetails, this.position, this.getBlock(), this.v());
+ }
2016-02-29 23:09:49 +00:00
+ // Paper end
2016-05-12 02:07:46 +00:00
crashreportsystemdetails.a("Actual block type", new CrashReportCallable() {
2015-03-08 01:16:09 +00:00
public String a() throws Exception {
int i = Block.getId(TileEntity.this.world.getType(TileEntity.this.position).getBlock());
diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
index 39919ab1c..632d5c760 100644
--- a/src/main/java/net/minecraft/server/World.java
+++ b/src/main/java/net/minecraft/server/World.java
2017-03-15 14:32:50 +00:00
@@ -1446,10 +1446,12 @@ public abstract class World implements IBlockAccess {
2016-03-25 04:59:37 +00:00
entity.tickTimer.stopTiming(); // Paper
} catch (Throwable throwable1) {
2016-03-25 04:59:37 +00:00
entity.tickTimer.stopTiming();
2016-02-29 23:09:49 +00: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-02-29 23:09:49 +00:00
+ // Paper end
}
}
2017-03-15 14:32:50 +00:00
@@ -1512,10 +1514,13 @@ public abstract class World implements IBlockAccess {
2016-11-17 02:23:38 +00:00
((ITickable) tileentity).F_();
2016-02-29 23:09:49 +00:00
this.methodProfiler.b();
} catch (Throwable throwable2) {
2016-02-29 23:09:49 +00:00
- crashreport1 = CrashReport.a(throwable2, "Ticking block entity");
- crashreportsystemdetails1 = crashreport1.a("Block entity being ticked");
- tileentity.a(crashreportsystemdetails1);
- throw new ReportedException(crashreport1);
2016-02-29 23:09:49 +00: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-02-29 23:09:49 +00:00
+ this.tileEntityListTick.remove(tileTickPosition--);
+ continue;
2016-02-29 23:09:49 +00:00
+ // Paper end
}
// Spigot start
finally {
--
2017-04-22 06:16:45 +00:00
2.12.2