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

69 lines
3.7 KiB
Diff
Raw Normal View History

2015-05-19 01:41:57 +02:00
From 1fb4dc33fce6c03c3f59247be6ea2115b9ac41a2 Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
2015-03-08 02:16:09 +01:00
Date: Sun, 8 Mar 2015 04:37:23 -0500
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 0a21872..bbcca2a 100644
--- a/src/main/java/net/minecraft/server/TileEntity.java
+++ b/src/main/java/net/minecraft/server/TileEntity.java
2015-03-08 02:16:09 +01:00
@@ -163,7 +163,12 @@ public abstract class TileEntity {
}
});
if (this.world != null) {
- CrashReportSystemDetails.a(crashreportsystemdetails, this.position, this.w(), this.u());
+ // PaperSpigot start - Prevent tile entity and entity crashes
+ Block block = this.w();
2015-03-08 02:16:09 +01:00
+ if (block != null) {
+ CrashReportSystemDetails.a(crashreportsystemdetails, this.position, this.w(), this.u());
+ }
+ // PaperSpigot end
2015-03-08 02:16:09 +01:00
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
2015-05-19 01:41:57 +02:00
index 431fc0d..7d90de2 100644
--- a/src/main/java/net/minecraft/server/World.java
+++ b/src/main/java/net/minecraft/server/World.java
2015-05-19 01:41:57 +02:00
@@ -1420,10 +1420,13 @@ public abstract class World implements IBlockAccess {
this.g(entity);
SpigotTimings.tickEntityTimer.stopTiming(); // Spigot
} catch (Throwable throwable1) {
- crashreport = CrashReport.a(throwable1, "Ticking entity");
- crashreportsystemdetails = crashreport.a("Entity being ticked");
- entity.appendEntityCrashDetails(crashreportsystemdetails);
- throw new ReportedException(crashreport);
+ // PaperSpigot start - Prevent tile entity and entity crashes
+ SpigotTimings.tickEntityTimer.stopTiming();
+ System.err.println("Entity threw exception at " + entity.world.getWorld().getName() + ":" + entity.locX + "," + entity.locY + "," + entity.locZ);
+ throwable1.printStackTrace();
+ entity.dead = true;
+ continue;
+ // PaperSpigot end
}
}
2015-05-19 01:41:57 +02:00
@@ -1489,11 +1492,13 @@ public abstract class World implements IBlockAccess {
tileentity.tickTimer.startTiming(); // Spigot
((IUpdatePlayerListBox) tileentity).c();
} catch (Throwable throwable2) {
- CrashReport crashreport1 = CrashReport.a(throwable2, "Ticking block entity");
- CrashReportSystemDetails crashreportsystemdetails1 = crashreport1.a("Block entity being ticked");
-
- tileentity.a(crashreportsystemdetails1);
- throw new ReportedException(crashreport1);
+ // PaperSpigot start - Prevent tile entity and entity crashes
+ tileentity.tickTimer.stopTiming();
+ System.err.println("TileEntity threw exception at " + tileentity.world.getWorld().getName() + ":" + tileentity.position.getX() + "," + tileentity.position.getY() + "," + tileentity.position.getZ());
+ throwable2.printStackTrace();
+ iterator.remove();
+ continue;
+ // PaperSpigot end
}
// Spigot start
finally {
--
2015-05-19 01:41:57 +02:00
2.4.1.windows.1