Mirror von
https://github.com/PaperMC/Paper.git
synchronisiert 2024-12-15 11:00:06 +01:00
f956f185c8
Upstream has released updates that appears to apply and compile correctly. This update has not been tested by PaperMC and as with ANY update, please do your own testing Bukkit Changes: 47b9cf30 SPIGOT-4372: LightningStrikeEvent cause API a9ceda75 Include the plugin channel name in the exception message CraftBukkit Changes:a4bdecffSPIGOT-4372: LightningStrikeEvent cause API34caaf6dSPIGOT-4371: Trident damaged when event cancelled97315374SPIGOT-4369: Handle cancelled trident eventbf1c8273SPIGOT-4370: Remove vehicle if its passenger spawn event was cancelled Spigot Changes: 6b015b4b SPIGOT-4370: Remove vehicle if its passenger spawn event was cancelled
67 Zeilen
3.7 KiB
Diff
67 Zeilen
3.7 KiB
Diff
From 79a3b07620008e12ad07d2489dea841eb1314a44 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 68ac014aab..c5212417c6 100644
|
|
--- a/src/main/java/net/minecraft/server/TileEntity.java
|
|
+++ b/src/main/java/net/minecraft/server/TileEntity.java
|
|
@@ -178,7 +178,12 @@ public abstract class TileEntity implements KeyedObject { // Paper
|
|
return IRegistry.BLOCK_ENTITY_TYPE.getKey(this.C()) + " // " + this.getClass().getCanonicalName();
|
|
});
|
|
if (this.world != null) {
|
|
- CrashReportSystemDetails.a(crashreportsystemdetails, this.position, this.getBlock());
|
|
+ // Paper start - Prevent TileEntity and Entity crashes
|
|
+ IBlockData block = this.getBlock();
|
|
+ if (block != null) {
|
|
+ CrashReportSystemDetails.a(crashreportsystemdetails, this.position, block);
|
|
+ }
|
|
+ // 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 8984949ff5..4afa16fb8a 100644
|
|
--- a/src/main/java/net/minecraft/server/World.java
|
|
+++ b/src/main/java/net/minecraft/server/World.java
|
|
@@ -1197,10 +1197,12 @@ public abstract class World implements IEntityAccess, GeneratorAccess, IIBlockAc
|
|
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
|
|
}
|
|
}
|
|
|
|
@@ -1263,10 +1265,13 @@ public abstract class World implements IEntityAccess, GeneratorAccess, IIBlockAc
|
|
((ITickable) tileentity).Y_();
|
|
this.methodProfiler.e();
|
|
} 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.19.0
|
|
|