testserver/Spigot-Server-Patches/0026-Prevent-tile-entity-an...

69 lines
3.6 KiB
Diff
Raw Normal View History

From 0dbbc4d55f0d3ef9913bafb08a34bc1f608a6f97 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 22a8ea916a..e1db243165 100644
--- a/src/main/java/net/minecraft/server/TileEntity.java
+++ b/src/main/java/net/minecraft/server/TileEntity.java
@@ -193,7 +193,12 @@ public abstract class TileEntity implements KeyedObject { // Paper
2019-04-24 02:34:11 +00:00
return IRegistry.BLOCK_ENTITY_TYPE.getKey(this.q()) + " // " + this.getClass().getCanonicalName();
2015-03-08 01:16:09 +00:00
});
if (this.world != null) {
- CrashReportSystemDetails.a(crashreportsystemdetails, this.position, this.getBlock());
2016-02-29 23:09:49 +00:00
+ // Paper start - Prevent TileEntity and Entity crashes
+ IBlockData block = this.getBlock();
2015-03-08 01:16:09 +00:00
+ if (block != null) {
+ CrashReportSystemDetails.a(crashreportsystemdetails, this.position, block);
+ }
2016-02-29 23:09:49 +00: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 bdb69afab6..1915dd9145 100644
--- a/src/main/java/net/minecraft/server/World.java
+++ b/src/main/java/net/minecraft/server/World.java
2019-06-11 00:29:30 +00:00
@@ -714,11 +714,13 @@ public abstract class World implements IIBlockAccess, GeneratorAccess, AutoClose
2019-05-14 02:20:58 +00:00
2019-04-24 02:34:11 +00:00
gameprofilerfiller.exit();
} catch (Throwable throwable) {
- CrashReport crashreport = CrashReport.a(throwable, "Ticking block entity");
- CrashReportSystemDetails crashreportsystemdetails = crashreport.a("Block entity being ticked");
-
- tileentity.a(crashreportsystemdetails);
- throw new ReportedException(crashreport);
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());
2019-04-24 02:34:11 +00:00
+ throwable.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 {
@@ -787,11 +789,12 @@ public abstract class World implements IIBlockAccess, GeneratorAccess, AutoClose
2019-04-24 02:34:11 +00:00
// Spigot end
consumer.accept(entity);
} catch (Throwable throwable) {
- CrashReport crashreport = CrashReport.a(throwable, "Ticking entity");
- CrashReportSystemDetails crashreportsystemdetails = crashreport.a("Entity being ticked");
-
- entity.appendEntityCrashDetails(crashreportsystemdetails);
- throw new ReportedException(crashreport);
+ // 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);
+ throwable.printStackTrace();
+ entity.dead = true;
+ return;
+ // Paper end
2019-05-14 02:20:58 +00:00
} finally {
entity.tickTimer.stopTiming();
timings.tickEntities.stopTiming();
--
2.22.0