Paper/CraftBukkit-Patches/0069-Try-and-Debug-Crash-Reports-Crashing.patch

42 lines
1.9 KiB
Diff
Raw Normal View History

2015-05-25 14:05:40 +02:00
From cdbd805f597fc3d83bbe2f17e0a86e370a5977cf Mon Sep 17 00:00:00 2001
From: md_5 <git@md-5.net>
Date: Sun, 12 Jan 2014 20:56:41 +1100
Subject: [PATCH] Try and Debug Crash Reports Crashing
diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
2015-05-25 14:05:40 +02:00
index ab9bb09..43ef181 100644
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
2015-05-09 22:23:26 +02:00
@@ -745,7 +745,13 @@ public abstract class MinecraftServer implements Runnable, ICommandListener, IAs
worldserver.doTick();
worldserver.timings.doTick.stopTiming(); // Spigot
2015-02-28 12:36:22 +01:00
} catch (Throwable throwable) {
+ // Spigot Start
+ try {
2015-02-28 12:36:22 +01:00
crashreport = CrashReport.a(throwable, "Exception ticking world");
+ } catch (Throwable t){
+ throw new RuntimeException("Error generating crash report", t);
+ }
+ // Spigot End
worldserver.a(crashreport);
throw new ReportedException(crashreport);
}
2015-05-09 22:23:26 +02:00
@@ -755,7 +761,13 @@ public abstract class MinecraftServer implements Runnable, ICommandListener, IAs
worldserver.tickEntities();
worldserver.timings.tickEntities.stopTiming(); // Spigot
2015-02-28 12:36:22 +01:00
} catch (Throwable throwable1) {
+ // Spigot Start
+ try {
2015-02-28 12:36:22 +01:00
crashreport = CrashReport.a(throwable1, "Exception ticking world entities");
+ } catch (Throwable t){
+ throw new RuntimeException("Error generating crash report", t);
+ }
+ // Spigot End
worldserver.a(crashreport);
throw new ReportedException(crashreport);
}
--
2015-05-09 22:23:26 +02:00
2.1.4