diff --git a/CraftBukkit-Patches/0010-Spigot-Timings.patch b/CraftBukkit-Patches/0010-Spigot-Timings.patch index 7fe49560f4..14c4551875 100644 --- 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(); diff --git a/CraftBukkit-Patches/0149-Implement-SpawnerSpawnEvent.patch b/CraftBukkit-Patches/0149-Implement-SpawnerSpawnEvent.patch index 94eb3e69ca..d6bf63595a 100644 --- a/CraftBukkit-Patches/0149-Implement-SpawnerSpawnEvent.patch +++ b/CraftBukkit-Patches/0149-Implement-SpawnerSpawnEvent.patch @@ -23,10 +23,9 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java @@ -0,0 +0,0 @@ public class CraftEventFactory { - event.getInventory().setItem(2, event.getResult()); return event; } -+ + + /** + * Mob spawner event. + */ @@ -41,5 +40,8 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 + entity.getServer().getPluginManager().callEvent(event); + return event; + } - } ++ + public static EntityToggleGlideEvent callToggleGlideEvent(EntityLiving entity, boolean gliding) { + EntityToggleGlideEvent event = new EntityToggleGlideEvent((LivingEntity) entity.getBukkitEntity(), gliding); + entity.world.getServer().getPluginManager().callEvent(event); -- \ No newline at end of file