spigot/CraftBukkit-Patches/0079-Try-and-Debug-Crash-Reports-Crashing.patch

42 lines
1.9 KiB
Diff
Raw Normal View History

2014-08-18 10:02:45 +01:00
From 989e873c1c02b1b3a8566c9d5b61812bc8277d58 Mon Sep 17 00:00:00 2001
2014-04-12 14:18:37 +10:00
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
2014-08-05 17:29:09 +01:00
index 6a31aaa..28471d6 100644
2014-04-12 14:18:37 +10:00
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
2014-08-05 17:29:09 +01:00
@@ -664,7 +664,13 @@ public abstract class MinecraftServer implements ICommandListener, Runnable, IMo
2014-04-12 14:18:37 +10:00
worldserver.doTick();
worldserver.timings.doTick.stopTiming(); // Spigot
2014-04-12 14:18:37 +10:00
} catch (Throwable throwable) {
+ // Spigot Start
+ try {
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);
}
2014-08-05 17:29:09 +01:00
@@ -674,7 +680,13 @@ public abstract class MinecraftServer implements ICommandListener, Runnable, IMo
2014-04-12 14:18:37 +10:00
worldserver.tickEntities();
worldserver.timings.tickEntities.stopTiming(); // Spigot
2014-04-12 14:18:37 +10:00
} catch (Throwable throwable1) {
+ // Spigot Start
+ try {
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);
}
--
2014-04-19 09:15:23 +10:00
1.9.1
2014-04-12 14:18:37 +10:00