19972e09b8
5a0150f586ed3eb15fe6f1f596d1a5a7d806f0f9 Fix ITEM_BREAK e6a3911057bd94d8bd7021cbb4923fb84fb106d1 Upstream merge d1cdcf8d4c3639f956474f02ed662517cffbe23e Remove old patch 068df64aeee368377e1673667bffc7a6dcf90554 Rebuild all patches
42 lines
1.9 KiB
Diff
42 lines
1.9 KiB
Diff
From ff274b6f8e30286775d5c6b10f50490523591142 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
|
|
index 6ff5211..85c3e3f 100644
|
|
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
|
|
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
|
|
@@ -719,7 +719,13 @@ public abstract class MinecraftServer implements ICommandListener, Runnable, IAs
|
|
worldserver.doTick();
|
|
worldserver.timings.doTick.stopTiming(); // Spigot
|
|
} catch (Throwable throwable1) {
|
|
+ // Spigot Start
|
|
+ try {
|
|
crashreport = CrashReport.a(throwable1, "Exception ticking world");
|
|
+ } catch (Throwable t){
|
|
+ throw new RuntimeException("Error generating crash report", t);
|
|
+ }
|
|
+ // Spigot End
|
|
worldserver.a(crashreport);
|
|
throw new ReportedException(crashreport);
|
|
}
|
|
@@ -729,7 +735,13 @@ public abstract class MinecraftServer implements ICommandListener, Runnable, IAs
|
|
worldserver.tickEntities();
|
|
worldserver.timings.tickEntities.stopTiming(); // Spigot
|
|
} catch (Throwable throwable2) {
|
|
+ // Spigot Start
|
|
+ try {
|
|
crashreport = CrashReport.a(throwable2, "Exception ticking world entities");
|
|
+ } catch (Throwable t){
|
|
+ throw new RuntimeException("Error generating crash report", t);
|
|
+ }
|
|
+ // Spigot End
|
|
worldserver.a(crashreport);
|
|
throw new ReportedException(crashreport);
|
|
}
|
|
--
|
|
2.1.0
|
|
|