2016-12-17 05:23:03 +01:00
|
|
|
From 4b8c160adcef0468b38af857709f1a50f7a916ec Mon Sep 17 00:00:00 2001
|
2014-12-22 22:13:29 +01:00
|
|
|
From: Aikar <aikar@aikar.co>
|
2016-03-01 00:09:49 +01:00
|
|
|
Date: Tue, 1 Mar 2016 23:52:34 -0600
|
2014-12-22 22:13:29 +01:00
|
|
|
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
|
2016-11-17 03:23:38 +01:00
|
|
|
index 0f505ed..1f3e89b 100644
|
2014-12-22 22:13:29 +01:00
|
|
|
--- a/src/main/java/net/minecraft/server/TileEntity.java
|
|
|
|
+++ b/src/main/java/net/minecraft/server/TileEntity.java
|
2016-11-17 03:23:38 +01:00
|
|
|
@@ -175,7 +175,12 @@ public abstract class TileEntity {
|
2015-03-08 02:16:09 +01:00
|
|
|
}
|
|
|
|
});
|
2014-12-22 22:13:29 +01:00
|
|
|
if (this.world != null) {
|
2016-11-17 03:23:38 +01:00
|
|
|
- CrashReportSystemDetails.a(crashreportsystemdetails, this.position, this.getBlock(), this.v());
|
2016-03-01 00:09:49 +01:00
|
|
|
+ // Paper start - Prevent TileEntity and Entity crashes
|
|
|
|
+ Block block = this.getBlock();
|
2015-03-08 02:16:09 +01:00
|
|
|
+ if (block != null) {
|
2016-11-17 03:23:38 +01:00
|
|
|
+ CrashReportSystemDetails.a(crashreportsystemdetails, this.position, this.getBlock(), this.v());
|
2014-12-22 22:13:29 +01:00
|
|
|
+ }
|
2016-03-01 00:09:49 +01:00
|
|
|
+ // Paper end
|
2016-05-12 04:07:46 +02:00
|
|
|
crashreportsystemdetails.a("Actual block type", new CrashReportCallable() {
|
2015-03-08 02:16:09 +01:00
|
|
|
public String a() throws Exception {
|
|
|
|
int i = Block.getId(TileEntity.this.world.getType(TileEntity.this.position).getBlock());
|
2014-12-22 22:13:29 +01:00
|
|
|
diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
|
2016-12-17 05:23:03 +01:00
|
|
|
index 0d917b6..536da4d 100644
|
2014-12-22 22:13:29 +01:00
|
|
|
--- a/src/main/java/net/minecraft/server/World.java
|
|
|
|
+++ b/src/main/java/net/minecraft/server/World.java
|
2016-12-17 05:23:03 +01:00
|
|
|
@@ -1468,10 +1468,12 @@ public abstract class World implements IBlockAccess {
|
2016-03-25 05:59:37 +01:00
|
|
|
entity.tickTimer.stopTiming(); // Paper
|
2014-12-22 22:13:29 +01:00
|
|
|
} 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
|
2014-12-22 22:13:29 +01:00
|
|
|
+ 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
|
2014-12-22 22:13:29 +01:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2016-12-17 05:23:03 +01:00
|
|
|
@@ -1534,10 +1536,13 @@ public abstract class World implements IBlockAccess {
|
2016-11-17 03:23:38 +01:00
|
|
|
((ITickable) tileentity).F_();
|
2016-03-01 00:09:49 +01:00
|
|
|
this.methodProfiler.b();
|
2014-12-22 22:13:29 +01:00
|
|
|
} 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");
|
2014-12-22 22:13:29 +01:00
|
|
|
- tileentity.a(crashreportsystemdetails1);
|
|
|
|
- throw new ReportedException(crashreport1);
|
2016-03-01 00:09:49 +01:00
|
|
|
+ // Paper start - Prevent tile entity and entity crashes
|
2014-12-22 22:13:29 +01:00
|
|
|
+ System.err.println("TileEntity threw exception at " + tileentity.world.getWorld().getName() + ":" + tileentity.position.getX() + "," + tileentity.position.getY() + "," + tileentity.position.getZ());
|
|
|
|
+ throwable2.printStackTrace();
|
2015-09-19 16:34:17 +02:00
|
|
|
+ tilesThisCycle--;
|
2016-03-01 00:09:49 +01:00
|
|
|
+ this.tileEntityListTick.remove(tileTickPosition--);
|
2014-12-22 22:13:29 +01:00
|
|
|
+ continue;
|
2016-03-01 00:09:49 +01:00
|
|
|
+ // Paper end
|
2014-12-22 22:13:29 +01:00
|
|
|
}
|
|
|
|
// Spigot start
|
|
|
|
finally {
|
|
|
|
--
|
2016-12-17 05:13:45 +01:00
|
|
|
2.9.3
|
2014-12-22 22:13:29 +01:00
|
|
|
|