Fix patch conflicts

2016-03-12 20:59:15 +11:00
parent b7d6f29245
commit bd4ee28e5c
2 changed files with 6 additions and 4 deletions
--- a/CraftBukkit-Patches/0010-Spigot-Timings.patch
+++ b/CraftBukkit-Patches/0010-Spigot-Timings.patch
@@ -464,7 +464,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
@@ -0,0 +0,0 @@ public abstract class World implements IBlockAccess {
                 if (this.isLoaded(blockposition) && this.N.a(blockposition)) {
                     try {
-                         this.methodProfiler.a(tileentity.getClass().getSimpleName());
+                         this.methodProfiler.a(""/*tileentity.getClass().getSimpleName()*/); // CraftBukkit: SPIGOT-1900
 +                        tileentity.tickTimer.startTiming(); // Spigot
                         ((ITickable) tileentity).c();
                         this.methodProfiler.b();