From 001a3a2e209c4b88d6055a0b31a3bd0550383dcd Mon Sep 17 00:00:00 2001 From: md_5 Date: Fri, 16 Jan 2015 14:58:23 +1100 Subject: [PATCH] Merge in changes. --- CraftBukkit-Patches/0012-Spigot-Timings.patch | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/CraftBukkit-Patches/0012-Spigot-Timings.patch b/CraftBukkit-Patches/0012-Spigot-Timings.patch index b87bcff56..bd0d26371 100644 --- a/CraftBukkit-Patches/0012-Spigot-Timings.patch +++ b/CraftBukkit-Patches/0012-Spigot-Timings.patch @@ -174,8 +174,8 @@ diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/jav index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644 --- a/src/main/java/net/minecraft/server/EntityLiving.java +++ b/src/main/java/net/minecraft/server/EntityLiving.java -@@ -0,0 +0,0 @@ import org.bukkit.event.entity.EntityDamageEvent.DamageModifier; - import org.bukkit.event.entity.EntityRegainHealthEvent; +@@ -0,0 +0,0 @@ import org.bukkit.event.entity.EntityRegainHealthEvent; + import org.bukkit.event.vehicle.VehicleExitEvent; // CraftBukkit end +import org.bukkit.craftbukkit.SpigotTimings; // Spigot