Find + replace saves the day

CraftBukkit-Patches/0014-Improved-Timings-System.patch

@@ -1,4 +1,4 @@
-From df973d43d513df224bd4b4f0c44107eff74c299f Mon Sep 17 00:00:00 2001
+From 686a257cf480797672667e37893b63351f676ad8 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Thu, 10 Jan 2013 00:18:11 -0500
 Subject: [PATCH] Improved Timings System
@@ -26,14 +26,14 @@ index b73f69c..17934c0 100644
  
          // CraftBukkit start - If we didn't need to load the chunk run the callback now
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index 0f7be97..c4fa4f3 100644
+index 0f7be97..978b6ef 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
 @@ -14,6 +14,7 @@ import org.bukkit.block.BlockFace;
  import org.bukkit.entity.LivingEntity;
  import org.bukkit.entity.Painting;
  import org.bukkit.entity.Vehicle;
-+import org.bukkit.CustomTimingsHandler; // Spigot
++import org.spigotmc.CustomTimingsHandler; // Spigot
  import org.bukkit.event.entity.EntityCombustByEntityEvent;
  import org.bukkit.event.painting.PaintingBreakByEntityEvent;
  import org.bukkit.event.vehicle.VehicleBlockCollisionEvent;
@@ -132,7 +132,7 @@ index 965e6ce..58a4acb 100644
          this.world.methodProfiler.b();
          this.world.methodProfiler.a("looting");
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 3c80340..044db9f 100644
+index 3c80340..db396b3 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -6,7 +6,6 @@ import java.security.KeyPair;
@@ -158,7 +158,7 @@ index 3c80340..044db9f 100644
 +                    SpigotTimings.serverTickTimer.startTiming();
                      this.q();
 +                    SpigotTimings.serverTickTimer.stopTiming();
-+                    org.bukkit.CustomTimingsHandler.tick();
++                    org.spigotmc.CustomTimingsHandler.tick();
                  }
                  // Spigot end
              } else {
@@ -249,14 +249,14 @@ index bc55a77..2e1246e 100644
  
          /* CraftBukkit start - No longer needed as we have already handled it in server.dispatchServerCommand above.
 diff --git a/src/main/java/net/minecraft/server/TileEntity.java b/src/main/java/net/minecraft/server/TileEntity.java
-index db3fc42..174546d 100644
+index db3fc42..ffa9bb6 100644
 --- a/src/main/java/net/minecraft/server/TileEntity.java
 +++ b/src/main/java/net/minecraft/server/TileEntity.java
 @@ -4,10 +4,12 @@ import java.util.HashMap;
  import java.util.Map;
  import java.util.concurrent.Callable;
  
-+import org.bukkit.CustomTimingsHandler; // Spigot
++import org.spigotmc.CustomTimingsHandler; // Spigot
  import org.bukkit.inventory.InventoryHolder; // CraftBukkit
  
  public class TileEntity {
@@ -394,14 +394,14 @@ index 3a321da..a2f7fee 100644
      public BiomeMeta a(EnumCreatureType enumcreaturetype, int i, int j, int k) {
 diff --git a/src/main/java/org/bukkit/craftbukkit/SpigotTimings.java b/src/main/java/org/bukkit/craftbukkit/SpigotTimings.java
 new file mode 100644
-index 0000000..bbb6368
+index 0000000..f5befbf
 --- /dev/null
 +++ b/src/main/java/org/bukkit/craftbukkit/SpigotTimings.java
 @@ -0,0 +1,110 @@
 +package org.bukkit.craftbukkit;
 +
 +import net.minecraft.server.*;
-+import org.bukkit.CustomTimingsHandler;
++import org.spigotmc.CustomTimingsHandler;
 +import org.bukkit.scheduler.BukkitTask;
 +
 +import java.util.HashMap;
@@ -509,7 +509,7 @@ index 0000000..bbb6368
 +    }
 +}
 diff --git a/src/main/java/org/bukkit/craftbukkit/scheduler/CraftTask.java b/src/main/java/org/bukkit/craftbukkit/scheduler/CraftTask.java
-index 55db3ff..df134e3 100644
+index 55db3ff..d644d08 100644
 --- a/src/main/java/org/bukkit/craftbukkit/scheduler/CraftTask.java
 +++ b/src/main/java/org/bukkit/craftbukkit/scheduler/CraftTask.java
 @@ -1,6 +1,8 @@
@@ -517,7 +517,7 @@ index 55db3ff..df134e3 100644
  
  import org.bukkit.Bukkit;
 +import org.bukkit.craftbukkit.SpigotTimings; // Spigot
-+import org.bukkit.CustomTimingsHandler; // Spigot
++import org.spigotmc.CustomTimingsHandler; // Spigot
  import org.bukkit.plugin.Plugin;
  import org.bukkit.scheduler.BukkitTask;
  
@@ -553,5 +553,5 @@ index 55db3ff..df134e3 100644
  
      long getPeriod() {
 -- 
-1.8.2.1
+1.8.1.2
 

CraftBukkit-Patches/0015-Orebfuscator.patch

@@ -1,4 +1,4 @@
-From 920d39b5cabeb00b96713ff75df69d576c906283 Mon Sep 17 00:00:00 2001
+From c7d781f5bf898cf2250310ad992e2cf016cfd1c3 Mon Sep 17 00:00:00 2001
 From: md_5 <md_5@live.com.au>
 Date: Thu, 16 May 2013 18:51:05 +1000
 Subject: [PATCH] Orebfuscator
@@ -173,10 +173,10 @@ index 67477f4..e5004b3 100644
          }
 diff --git a/src/main/java/org/spigotmc/OrebfuscatorManager.java b/src/main/java/org/spigotmc/OrebfuscatorManager.java
 new file mode 100644
-index 0000000..ab4d409
+index 0000000..8e1ed81
 --- /dev/null
 +++ b/src/main/java/org/spigotmc/OrebfuscatorManager.java
-@@ -0,0 +1,186 @@
+@@ -0,0 +1,185 @@
 +package org.spigotmc;
 +
 +import gnu.trove.set.TByteSet;
@@ -184,7 +184,6 @@ index 0000000..ab4d409
 +import net.minecraft.server.Block;
 +import net.minecraft.server.MinecraftServer;
 +import net.minecraft.server.World;
-+import org.bukkit.CustomTimingsHandler;
 +
 +public class OrebfuscatorManager
 +{

CraftBukkit-Patches/0020-Watchdog-Thread.patch

@@ -1,17 +1,17 @@
-From 0d8044768b64182f10d4b86615c01f509e5eb97c Mon Sep 17 00:00:00 2001
+From e6e61e6fecc68b7870230273a6510b751826bb21 Mon Sep 17 00:00:00 2001
 From: md_5 <md_5@live.com.au>
 Date: Sat, 23 Feb 2013 12:33:20 +1100
 Subject: [PATCH] Watchdog Thread.
 
 
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 044db9f..d57ed7a 100644
+index db396b3..d197f06 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -404,6 +404,7 @@ public abstract class MinecraftServer implements ICommandListener, Runnable, IMo
                      this.q();
                      SpigotTimings.serverTickTimer.stopTiming();
-                     org.bukkit.CustomTimingsHandler.tick();
+                     org.spigotmc.CustomTimingsHandler.tick();
 +                    org.spigotmc.WatchdogThread.tick();
                  }
                  // Spigot end
@@ -295,5 +295,5 @@ index 96d26d4..67b4fa9 100644
      default:
          growth-chunks-per-tick: 650
 -- 
-1.8.2.1
+1.8.1.2