SteamWar/Paper
9
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix a merge conflict that was resolved improperly

Browse Source
This commit is contained in:
Zach Brown
2016-12-20 18:01:37 -06:00
parent ec68dfff5a
commit cd80c0a2f7
2 changed files with 6 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
Spigot-Server-Patches/Timings-v2.patch
View File

@@ -1169,9 +1169,6 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
+ entity.tickTimer.startTiming(); // Paper + entity.tickTimer.startTiming(); // Paper
this.h(entity); this.h(entity);
- SpigotTimings.tickEntityTimer.stopTiming(); // Spigot - SpigotTimings.tickEntityTimer.stopTiming(); // Spigot
+ entity.tickTimer.stopTiming(); // Paper
+ entity.tickTimer.startTiming(); // Paper
+ this.g(entity);
+ entity.tickTimer.stopTiming(); // Paper + entity.tickTimer.stopTiming(); // Paper
} catch (Throwable throwable1) { } catch (Throwable throwable1) {
+ entity.tickTimer.stopTiming(); + entity.tickTimer.stopTiming();