diff --git a/Bukkit-Patches/0002-Skeleton-API-Implementations.patch b/Bukkit-Patches/0002-Skeleton-API-Implementations.patch index 4a8657d3..6bb9ce61 100644 --- a/Bukkit-Patches/0002-Skeleton-API-Implementations.patch +++ b/Bukkit-Patches/0002-Skeleton-API-Implementations.patch @@ -1,4 +1,4 @@ -From 8d3350c639b9abeaf5451dfeeab4fe2494a5c0ca Mon Sep 17 00:00:00 2001 +From 95e81b49824bf41fe3bfd3d67f7ed7c59bd8bc5f Mon Sep 17 00:00:00 2001 From: md_5 Date: Mon, 15 May 2017 15:16:15 +1000 Subject: [PATCH] Skeleton API Implementations @@ -39,7 +39,7 @@ index b4fb0522..aa7c90cb 100644 + // Spigot end } diff --git a/src/main/java/org/bukkit/World.java b/src/main/java/org/bukkit/World.java -index 5de5774f..3498f4d9 100644 +index 0f93b251..42a4bc13 100644 --- a/src/main/java/org/bukkit/World.java +++ b/src/main/java/org/bukkit/World.java @@ -1961,6 +1961,16 @@ public interface World extends PluginMessageRecipient, Metadatable { @@ -57,8 +57,8 @@ index 5de5774f..3498f4d9 100644 + // Spigot end + /** - * Represents various map environment types that a world may be - */ + * Finds the nearest raid close to the given location. + * diff --git a/src/main/java/org/bukkit/command/CommandSender.java b/src/main/java/org/bukkit/command/CommandSender.java index d247b0d8..bf0f8cc4 100644 --- a/src/main/java/org/bukkit/command/CommandSender.java diff --git a/CraftBukkit-Patches/0002-Skeleton-API-Implementations.patch b/CraftBukkit-Patches/0002-Skeleton-API-Implementations.patch index 22f6b265..a74115dd 100644 --- a/CraftBukkit-Patches/0002-Skeleton-API-Implementations.patch +++ b/CraftBukkit-Patches/0002-Skeleton-API-Implementations.patch @@ -1,4 +1,4 @@ -From 2c4e9b66654d2a0eb143e2cc5e021f3123299686 Mon Sep 17 00:00:00 2001 +From 07086aae7f3976edb562cc46270b19e66d1fc5aa Mon Sep 17 00:00:00 2001 From: md_5 Date: Sun, 2 Jun 2013 15:10:56 +1000 Subject: [PATCH] Skeleton API Implementations @@ -25,12 +25,12 @@ index ef62a9ffe..ac381ae6a 100644 + } } diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java -index 6fd242b13..2f3941db6 100644 +index 7c895609d..75dbe7894 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java -@@ -2145,4 +2145,15 @@ public class CraftWorld implements World { - BlockPosition nearest = getHandle().getChunkProvider().getChunkGenerator().findNearestMapFeature(getHandle(), structureType.getName(), originPos, radius, findUnexplored); - return (nearest == null) ? null : new Location(this, nearest.getX(), nearest.getY(), nearest.getZ()); +@@ -2163,4 +2163,15 @@ public class CraftWorld implements World { + PersistentRaid persistentRaid = world.C(); // PAIL rename getPersistentRaid + return persistentRaid.a.values().stream().map(CraftRaid::new).collect(Collectors.toList()); } + + // Spigot start @@ -161,7 +161,7 @@ index b927b802a..2e91ebac0 100644 + // Spigot end } diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java -index e1d9952d3..5df2d7573 100644 +index 814dab0c5..b2d76291b 100644 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java @@ -1416,4 +1416,16 @@ class CraftMetaItem implements ItemMeta, Damageable, Repairable, BlockDataMeta { diff --git a/CraftBukkit-Patches/0006-Merge-tweaks-and-configuration.patch b/CraftBukkit-Patches/0006-Merge-tweaks-and-configuration.patch index eba7e058..b16e6445 100644 --- a/CraftBukkit-Patches/0006-Merge-tweaks-and-configuration.patch +++ b/CraftBukkit-Patches/0006-Merge-tweaks-and-configuration.patch @@ -1,4 +1,4 @@ -From 9561b0531d4becf7c4412db26082dbfce64150cf Mon Sep 17 00:00:00 2001 +From b1da25d3b8038a7b2a415d123fa8594f3040f227 Mon Sep 17 00:00:00 2001 From: md_5 Date: Sat, 23 Mar 2013 09:46:33 +1100 Subject: [PATCH] Merge tweaks and configuration @@ -31,10 +31,10 @@ index cd31e3c73..cc831fca8 100644 } else { a(entityitem, itemstack1, this, itemstack); diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java -index 61f93251b..b4ce7e08e 100644 +index 3502cac6d..e56a1f8eb 100644 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java -@@ -521,6 +521,23 @@ public class CraftEventFactory { +@@ -529,6 +529,23 @@ public class CraftEventFactory { event = CraftEventFactory.callProjectileLaunchEvent(entity); } else if (entity.getBukkitEntity() instanceof org.bukkit.entity.Vehicle){ event = CraftEventFactory.callVehicleCreateEvent(entity); diff --git a/CraftBukkit-Patches/0007-Async-Operation-Catching.patch b/CraftBukkit-Patches/0007-Async-Operation-Catching.patch index d131948c..51876825 100644 --- a/CraftBukkit-Patches/0007-Async-Operation-Catching.patch +++ b/CraftBukkit-Patches/0007-Async-Operation-Catching.patch @@ -1,4 +1,4 @@ -From c9bc57620066ba8433fbca3aaa20bc4afbef54cf Mon Sep 17 00:00:00 2001 +From c7f7c2150ebd1aef69f1ce6b24bb80efad55fe54 Mon Sep 17 00:00:00 2001 From: md_5 Date: Tue, 25 Mar 2014 16:10:01 +1100 Subject: [PATCH] Async Operation Catching @@ -6,7 +6,7 @@ Subject: [PATCH] Async Operation Catching Catch and throw an exception when a potentially unsafe operation occurs on a thread other than the main server thread. diff --git a/src/main/java/net/minecraft/server/Block.java b/src/main/java/net/minecraft/server/Block.java -index f13a0be0..abba434d 100644 +index f13a0be05..abba434da 100644 --- a/src/main/java/net/minecraft/server/Block.java +++ b/src/main/java/net/minecraft/server/Block.java @@ -376,10 +376,13 @@ public class Block implements IMaterial { @@ -25,7 +25,7 @@ index f13a0be0..abba434d 100644 world.removeTileEntity(blockposition); } diff --git a/src/main/java/net/minecraft/server/CraftingManager.java b/src/main/java/net/minecraft/server/CraftingManager.java -index 29a79be7..d0b4bf8b 100644 +index 29a79be72..d0b4bf8b7 100644 --- a/src/main/java/net/minecraft/server/CraftingManager.java +++ b/src/main/java/net/minecraft/server/CraftingManager.java @@ -65,6 +65,7 @@ public class CraftingManager extends ResourceDataJson { @@ -37,7 +37,7 @@ index 29a79be7..d0b4bf8b 100644 if (map.containsKey(irecipe.getKey())) { diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java -index a6bf7239..3bc4dd9d 100644 +index a6bf72397..3bc4dd9d1 100644 --- a/src/main/java/net/minecraft/server/EntityLiving.java +++ b/src/main/java/net/minecraft/server/EntityLiving.java @@ -821,6 +821,7 @@ public abstract class EntityLiving extends Entity { @@ -49,7 +49,7 @@ index a6bf7239..3bc4dd9d 100644 effectsToProcess.add(new ProcessableEffect(mobeffect, cause)); return true; diff --git a/src/main/java/net/minecraft/server/PlayerChunkMap.java b/src/main/java/net/minecraft/server/PlayerChunkMap.java -index 2765f37d..6cc87c42 100644 +index 2765f37dd..6cc87c423 100644 --- a/src/main/java/net/minecraft/server/PlayerChunkMap.java +++ b/src/main/java/net/minecraft/server/PlayerChunkMap.java @@ -954,6 +954,7 @@ public class PlayerChunkMap extends IChunkLoader implements PlayerChunk.d { @@ -85,7 +85,7 @@ index 2765f37d..6cc87c42 100644 Vec3D vec3d = (new Vec3D(entityplayer.locX, entityplayer.locY, entityplayer.locZ)).d(this.tracker.getPositionVector()); // MC-155077, SPIGOT-5113 int i = Math.min(this.trackingDistance, (PlayerChunkMap.this.viewDistance - 1) * 16); diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java -index 232b0789..a749179f 100644 +index 1b2793eb2..968e07133 100644 --- a/src/main/java/net/minecraft/server/WorldServer.java +++ b/src/main/java/net/minecraft/server/WorldServer.java @@ -902,6 +902,7 @@ public class WorldServer extends World { @@ -104,7 +104,7 @@ index 232b0789..a749179f 100644 if (entity instanceof EntityEnderDragon) { EntityComplexPart[] aentitycomplexpart = ((EntityEnderDragon) entity).dT(); int i = aentitycomplexpart.length; -@@ -998,6 +1000,7 @@ public class WorldServer extends World { +@@ -1004,6 +1006,7 @@ public class WorldServer extends World { } private void registerEntity(Entity entity) { @@ -113,7 +113,7 @@ index 232b0789..a749179f 100644 this.entitiesToAdd.add(entity); } else { diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -index 580fce0f..fb1127d0 100644 +index 580fce0f3..fb1127d09 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java @@ -685,6 +685,7 @@ public final class CraftServer implements Server { @@ -125,10 +125,10 @@ index 580fce0f..fb1127d0 100644 if (commandMap.dispatch(sender, commandLine)) { return true; diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java -index 254cc6d5..b1055e1f 100644 +index 75dbe7894..b6034fb00 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java -@@ -376,6 +376,7 @@ public class CraftWorld implements World { +@@ -378,6 +378,7 @@ public class CraftWorld implements World { @Override public boolean unloadChunkRequest(int x, int z) { @@ -136,7 +136,7 @@ index 254cc6d5..b1055e1f 100644 net.minecraft.server.IChunkAccess chunk = world.getChunkProvider().getChunkAt(x, z, ChunkStatus.FULL, false); if (chunk != null) { world.getChunkProvider().removeTicket(TicketType.PLUGIN, chunk.getPos(), 1, Unit.INSTANCE); -@@ -385,6 +386,7 @@ public class CraftWorld implements World { +@@ -387,6 +388,7 @@ public class CraftWorld implements World { } private boolean unloadChunk0(int x, int z, boolean save) { @@ -144,7 +144,7 @@ index 254cc6d5..b1055e1f 100644 net.minecraft.server.Chunk chunk = (net.minecraft.server.Chunk) world.getChunkProvider().getChunkAt(x, z, ChunkStatus.FULL, false); if (chunk == null) { return true; -@@ -399,6 +401,7 @@ public class CraftWorld implements World { +@@ -401,6 +403,7 @@ public class CraftWorld implements World { @Override public boolean regenerateChunk(int x, int z) { @@ -152,7 +152,7 @@ index 254cc6d5..b1055e1f 100644 throw new UnsupportedOperationException("Not supported in this Minecraft version! Unless you can fix it, this is not a bug :)"); /* if (!unloadChunk0(x, z, false)) { -@@ -450,6 +453,7 @@ public class CraftWorld implements World { +@@ -452,6 +455,7 @@ public class CraftWorld implements World { @Override public boolean loadChunk(int x, int z, boolean generate) { @@ -160,7 +160,7 @@ index 254cc6d5..b1055e1f 100644 IChunkAccess chunk = world.getChunkProvider().getChunkAt(x, z, generate ? ChunkStatus.FULL : ChunkStatus.EMPTY, true); // If generate = false, but the chunk already exists, we will get this back. -@@ -1158,6 +1162,7 @@ public class CraftWorld implements World { +@@ -1160,6 +1164,7 @@ public class CraftWorld implements World { @Override public void save() { @@ -169,7 +169,7 @@ index 254cc6d5..b1055e1f 100644 try { boolean oldSave = world.savingDisabled; diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -index ed4e0b28..26fd6984 100644 +index ed4e0b280..26fd6984a 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java @@ -300,6 +300,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player { @@ -181,7 +181,7 @@ index ed4e0b28..26fd6984 100644 getHandle().playerConnection.disconnect(message == null ? "" : message); diff --git a/src/main/java/org/bukkit/craftbukkit/scoreboard/CraftScoreboardManager.java b/src/main/java/org/bukkit/craftbukkit/scoreboard/CraftScoreboardManager.java -index fd9949e1..ca2be306 100644 +index fd9949e1e..ca2be3060 100644 --- a/src/main/java/org/bukkit/craftbukkit/scoreboard/CraftScoreboardManager.java +++ b/src/main/java/org/bukkit/craftbukkit/scoreboard/CraftScoreboardManager.java @@ -41,6 +41,7 @@ public final class CraftScoreboardManager implements ScoreboardManager { @@ -193,7 +193,7 @@ index fd9949e1..ca2be306 100644 scoreboards.add(scoreboard); return scoreboard; diff --git a/src/main/java/org/bukkit/craftbukkit/util/ServerShutdownThread.java b/src/main/java/org/bukkit/craftbukkit/util/ServerShutdownThread.java -index 2e057fd4..ddef523e 100644 +index 2e057fd4c..ddef523ea 100644 --- a/src/main/java/org/bukkit/craftbukkit/util/ServerShutdownThread.java +++ b/src/main/java/org/bukkit/craftbukkit/util/ServerShutdownThread.java @@ -12,6 +12,7 @@ public class ServerShutdownThread extends Thread { @@ -206,7 +206,7 @@ index 2e057fd4..ddef523e 100644 try { diff --git a/src/main/java/org/spigotmc/AsyncCatcher.java b/src/main/java/org/spigotmc/AsyncCatcher.java new file mode 100644 -index 00000000..aeed7697 +index 000000000..aeed76972 --- /dev/null +++ b/src/main/java/org/spigotmc/AsyncCatcher.java @@ -0,0 +1,17 @@ diff --git a/CraftBukkit-Patches/0008-View-Distance.patch b/CraftBukkit-Patches/0008-View-Distance.patch index 4a10b1f8..e86f9309 100644 --- a/CraftBukkit-Patches/0008-View-Distance.patch +++ b/CraftBukkit-Patches/0008-View-Distance.patch @@ -1,4 +1,4 @@ -From 432ea7c02b77293e6920b7864a8f7bab9a4bac31 Mon Sep 17 00:00:00 2001 +From 111d25677baa99bc99e3a18fd1e7b50d786cd3bf Mon Sep 17 00:00:00 2001 From: md_5 Date: Sat, 23 Mar 2013 09:52:41 +1100 Subject: [PATCH] View Distance @@ -28,7 +28,7 @@ index 1b4ebc133..6a6cd9471 100644 entityplayer1.dead = false; entityplayer1.playerConnection.teleport(new Location(worldserver.getWorld(), entityplayer1.locX, entityplayer1.locY, entityplayer1.locZ, entityplayer1.yaw, entityplayer1.pitch)); diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java -index a749179f7..742d5e8eb 100644 +index 968e07133..f033e23b5 100644 --- a/src/main/java/net/minecraft/server/WorldServer.java +++ b/src/main/java/net/minecraft/server/WorldServer.java @@ -82,7 +82,7 @@ public class WorldServer extends World { @@ -41,11 +41,11 @@ index a749179f7..742d5e8eb 100644 }); // CraftBukkit end diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java -index b1055e1f4..388f6043a 100644 +index b6034fb00..9ae40e78f 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java -@@ -2151,6 +2151,13 @@ public class CraftWorld implements World { - return (nearest == null) ? null : new Location(this, nearest.getX(), nearest.getY(), nearest.getZ()); +@@ -2169,6 +2169,13 @@ public class CraftWorld implements World { + return persistentRaid.a.values().stream().map(CraftRaid::new).collect(Collectors.toList()); } + // Spigot start diff --git a/CraftBukkit-Patches/0053-Implement-Silenceable-Lightning-API.patch b/CraftBukkit-Patches/0053-Implement-Silenceable-Lightning-API.patch index cc2d3cfc..2645a025 100644 --- a/CraftBukkit-Patches/0053-Implement-Silenceable-Lightning-API.patch +++ b/CraftBukkit-Patches/0053-Implement-Silenceable-Lightning-API.patch @@ -1,4 +1,4 @@ -From 5b50e5649af4a8564267730e49f0bec5750b52ae Mon Sep 17 00:00:00 2001 +From 0ace01b60b93998f7cc8684af23371e55dc7bcfe Mon Sep 17 00:00:00 2001 From: drXor Date: Sun, 23 Feb 2014 16:16:59 -0400 Subject: [PATCH] Implement Silenceable Lightning API @@ -41,10 +41,10 @@ index aeb0b4650..2ceee79cf 100644 // this.world.playSound((EntityHuman) null, this.locX, this.locY, this.locZ, SoundEffects.ENTITY_LIGHTNING_BOLT_THUNDER, SoundCategory.WEATHER, 10000.0F, 0.8F + this.random.nextFloat() * 0.2F); float pitch = 0.8F + this.random.nextFloat() * 0.2F; diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java -index 388f6043a..ca528b121 100644 +index 9ae40e78f..775fe5034 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java -@@ -2161,6 +2161,22 @@ public class CraftWorld implements World { +@@ -2179,6 +2179,22 @@ public class CraftWorld implements World { // Spigot start private final Spigot spigot = new Spigot() { diff --git a/CraftBukkit-Patches/0079-Don-t-spawn-bonus-ocelots-when-plugins-spawn-ocelots.patch b/CraftBukkit-Patches/0079-Don-t-spawn-bonus-ocelots-when-plugins-spawn-ocelots.patch index 5eaf2759..0a5a6f9d 100644 --- a/CraftBukkit-Patches/0079-Don-t-spawn-bonus-ocelots-when-plugins-spawn-ocelots.patch +++ b/CraftBukkit-Patches/0079-Don-t-spawn-bonus-ocelots-when-plugins-spawn-ocelots.patch @@ -1,4 +1,4 @@ -From 29f604cb3c8b5c9dbf6767191760294642e9b5c7 Mon Sep 17 00:00:00 2001 +From 1a357b658611b730de56ca969e75b2d43ba43a7a Mon Sep 17 00:00:00 2001 From: Thinkofdeath Date: Sat, 19 Jul 2014 12:49:48 +0100 Subject: [PATCH] Don't spawn bonus ocelots when plugins spawn ocelots @@ -26,10 +26,10 @@ index 3b84f60a7..a6b15efd5 100644 } diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java -index ca528b121..bdd085b88 100644 +index 775fe5034..a5abc0717 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java -@@ -1681,6 +1681,12 @@ public class CraftWorld implements World { +@@ -1683,6 +1683,12 @@ public class CraftWorld implements World { } if (entity != null) { diff --git a/CraftBukkit-Patches/0089-Add-Hunger-Config-Values.patch b/CraftBukkit-Patches/0089-Add-Hunger-Config-Values.patch index 235da94b..9bdbbb7d 100644 --- a/CraftBukkit-Patches/0089-Add-Hunger-Config-Values.patch +++ b/CraftBukkit-Patches/0089-Add-Hunger-Config-Values.patch @@ -1,14 +1,14 @@ -From 4ca464f11d170e8b05829af308804c9fd22448a1 Mon Sep 17 00:00:00 2001 +From a601864cb641a7c6db1f625f61c7314080e775c3 Mon Sep 17 00:00:00 2001 From: lazertester Date: Sun, 17 Aug 2014 19:56:17 +1000 Subject: [PATCH] Add Hunger Config Values diff --git a/src/main/java/net/minecraft/server/EntityHuman.java b/src/main/java/net/minecraft/server/EntityHuman.java -index 2cfbac0d5..08aa8709c 100644 +index 3797b01b2..b14193855 100644 --- a/src/main/java/net/minecraft/server/EntityHuman.java +++ b/src/main/java/net/minecraft/server/EntityHuman.java -@@ -1132,7 +1132,7 @@ public abstract class EntityHuman extends EntityLiving { +@@ -1133,7 +1133,7 @@ public abstract class EntityHuman extends EntityLiving { } } @@ -17,7 +17,7 @@ index 2cfbac0d5..08aa8709c 100644 } else { this.world.playSound((EntityHuman) null, this.locX, this.locY, this.locZ, SoundEffects.ENTITY_PLAYER_ATTACK_NODAMAGE, this.getSoundCategory(), 1.0F, 1.0F); if (flag4) { -@@ -1417,9 +1417,9 @@ public abstract class EntityHuman extends EntityLiving { +@@ -1418,9 +1418,9 @@ public abstract class EntityHuman extends EntityLiving { super.jump(); this.a(StatisticList.JUMP); if (this.isSprinting()) { @@ -29,7 +29,7 @@ index 2cfbac0d5..08aa8709c 100644 } } -@@ -1498,13 +1498,13 @@ public abstract class EntityHuman extends EntityLiving { +@@ -1499,13 +1499,13 @@ public abstract class EntityHuman extends EntityLiving { i = Math.round(MathHelper.sqrt(d0 * d0 + d1 * d1 + d2 * d2) * 100.0F); if (i > 0) { this.a(StatisticList.WALK_UNDER_WATER_ONE_CM, i); @@ -45,7 +45,7 @@ index 2cfbac0d5..08aa8709c 100644 } } else if (this.isClimbing()) { if (d1 > 0.0D) { -@@ -1515,13 +1515,13 @@ public abstract class EntityHuman extends EntityLiving { +@@ -1516,13 +1516,13 @@ public abstract class EntityHuman extends EntityLiving { if (i > 0) { if (this.isSprinting()) { this.a(StatisticList.SPRINT_ONE_CM, i); diff --git a/CraftBukkit-Patches/0099-Implement-SpawnerSpawnEvent.patch b/CraftBukkit-Patches/0099-Implement-SpawnerSpawnEvent.patch index 3b98bad0..e1894080 100644 --- a/CraftBukkit-Patches/0099-Implement-SpawnerSpawnEvent.patch +++ b/CraftBukkit-Patches/0099-Implement-SpawnerSpawnEvent.patch @@ -1,4 +1,4 @@ -From 90f0b63ebb9a0d98a12e314b31fde018ed7f0cfa Mon Sep 17 00:00:00 2001 +From 9dfe1448176b5819446b497c079eeffba938be13 Mon Sep 17 00:00:00 2001 From: md_5 Date: Thu, 3 Mar 2016 19:45:46 +1100 Subject: [PATCH] Implement SpawnerSpawnEvent. @@ -26,10 +26,10 @@ index 2e96a3661..dc0e93926 100644 this.a(entity); world.triggerEffect(2004, blockposition, 0); diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java -index b4ce7e08e..67076bdd1 100644 +index e56a1f8eb..4623201ee 100644 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java -@@ -193,6 +193,8 @@ import org.bukkit.inventory.InventoryView; +@@ -202,6 +202,8 @@ import org.bukkit.inventory.InventoryView; import org.bukkit.inventory.meta.BookMeta; import org.bukkit.potion.PotionEffect; @@ -38,7 +38,7 @@ index b4ce7e08e..67076bdd1 100644 public class CraftEventFactory { public static final DamageSource MELTING = CraftDamageSource.copyOf(DamageSource.BURN); public static final DamageSource POISON = CraftDamageSource.copyOf(DamageSource.MAGIC); -@@ -1338,6 +1340,21 @@ public class CraftEventFactory { +@@ -1346,6 +1348,21 @@ public class CraftEventFactory { return event; }