mirror of
https://github.com/PaperMC/Paper.git
synced 2024-12-23 01:17:44 +01:00
67 lines
3.6 KiB
Diff
67 lines
3.6 KiB
Diff
From c38899ff17304f5a6e10ac12f100d4b05efd4b02 Mon Sep 17 00:00:00 2001
|
|
From: Aikar <aikar@aikar.co>
|
|
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 4193f20..f579d28 100644
|
|
--- a/src/main/java/net/minecraft/server/TileEntity.java
|
|
+++ b/src/main/java/net/minecraft/server/TileEntity.java
|
|
@@ -164,7 +164,12 @@ public abstract class TileEntity {
|
|
}
|
|
});
|
|
if (this.world != null) {
|
|
- CrashReportSystemDetails.a(crashreportsystemdetails, this.position, this.getBlock(), this.u());
|
|
+ // Paper start - Prevent TileEntity and Entity crashes
|
|
+ Block block = this.getBlock();
|
|
+ if (block != null) {
|
|
+ CrashReportSystemDetails.a(crashreportsystemdetails, this.position, this.getBlock(), this.u());
|
|
+ }
|
|
+ // Paper end
|
|
crashreportsystemdetails.a("Actual block type", new Callable() {
|
|
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 87236e8..f8746b3 100644
|
|
--- a/src/main/java/net/minecraft/server/World.java
|
|
+++ b/src/main/java/net/minecraft/server/World.java
|
|
@@ -1435,10 +1435,12 @@ public abstract class World implements IBlockAccess {
|
|
entity.tickTimer.stopTiming(); // Paper
|
|
} catch (Throwable throwable1) {
|
|
entity.tickTimer.stopTiming();
|
|
- 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;
|
|
+ // Paper end
|
|
}
|
|
}
|
|
|
|
@@ -1500,10 +1502,13 @@ public abstract class World implements IBlockAccess {
|
|
((ITickable) tileentity).c();
|
|
this.methodProfiler.b();
|
|
} catch (Throwable throwable2) {
|
|
- crashreport1 = CrashReport.a(throwable2, "Ticking block entity");
|
|
- crashreportsystemdetails1 = crashreport1.a("Block entity being ticked");
|
|
- tileentity.a(crashreportsystemdetails1);
|
|
- throw new ReportedException(crashreport1);
|
|
+ // 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--;
|
|
+ this.tileEntityListTick.remove(tileTickPosition--);
|
|
+ continue;
|
|
+ // Paper end
|
|
}
|
|
// Spigot start
|
|
finally {
|
|
--
|
|
2.7.4
|
|
|