Fix more issues with timings

- fixed usage of timings IDs (fixes region view)
- fixed more duplicated tick handlers
This commit is contained in:
Shane Freeder
2019-07-08 03:54:40 +01:00
parent 93dacdccc5
commit 88377b6fdf
8 changed files with 61 additions and 73 deletions

View File

@@ -23,7 +23,7 @@ index 22a8ea916a..e1db243165 100644
}
}
diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
index bdb69afab6..1915dd9145 100644
index 67ea828427..35c6306b34 100644
--- a/src/main/java/net/minecraft/server/World.java
+++ b/src/main/java/net/minecraft/server/World.java
@@ -0,0 +0,0 @@ public abstract class World implements IIBlockAccess, GeneratorAccess, AutoClose
@@ -46,7 +46,7 @@ index bdb69afab6..1915dd9145 100644
// Spigot start
finally {
@@ -0,0 +0,0 @@ public abstract class World implements IIBlockAccess, GeneratorAccess, AutoClose
// Spigot end
try {
consumer.accept(entity);
} catch (Throwable throwable) {
- CrashReport crashreport = CrashReport.a(throwable, "Ticking entity");
@@ -60,7 +60,7 @@ index bdb69afab6..1915dd9145 100644
+ entity.dead = true;
+ return;
+ // Paper end
} finally {
entity.tickTimer.stopTiming();
timings.tickEntities.stopTiming();
}
}
--