diff --git a/CraftBukkit-Patches/0008-Async-Operation-Catching.patch b/CraftBukkit-Patches/0008-Async-Operation-Catching.patch index 4d0e3fe2f6..2c4bb13e68 100644 --- a/CraftBukkit-Patches/0008-Async-Operation-Catching.patch +++ b/CraftBukkit-Patches/0008-Async-Operation-Catching.patch @@ -1,4 +1,4 @@ -From 25e364121b19e256408c3a304bcfd117ad47e9b5 Mon Sep 17 00:00:00 2001 +From 49e75481d06159520ed6f324b3850419ec100811 Mon Sep 17 00:00:00 2001 From: md_5 Date: Tue, 25 Mar 2014 16:10:01 +1100 Subject: [PATCH] Async Operation Catching @@ -26,10 +26,10 @@ index 12589d6..1d2f580 100644 public int a(Random random) { return 1; diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java -index 3a0b94d..9b73738 100644 +index 750a5d9..73caf4e 100644 --- a/src/main/java/net/minecraft/server/EntityLiving.java +++ b/src/main/java/net/minecraft/server/EntityLiving.java -@@ -619,6 +619,7 @@ public abstract class EntityLiving extends Entity { +@@ -620,6 +620,7 @@ public abstract class EntityLiving extends Entity { } public void addEffect(MobEffect mobeffect) { @@ -78,7 +78,7 @@ index 8b38bd2..f8570a8 100644 this.trackedPlayers.remove(entityplayer); this.tracker.c(entityplayer); diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java -index 238f8f3..e0416a8 100644 +index e548d00..c73f0ef 100644 --- a/src/main/java/net/minecraft/server/World.java +++ b/src/main/java/net/minecraft/server/World.java @@ -897,6 +897,7 @@ public abstract class World implements IBlockAccess { @@ -146,7 +146,7 @@ index 01ba89f..e93cedb 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 db4c1db..12768ed 100644 +index 69fcb10..3992c71 100644 --- a/src/main/java/org/bukkit/craftbukkit/scoreboard/CraftScoreboardManager.java +++ b/src/main/java/org/bukkit/craftbukkit/scoreboard/CraftScoreboardManager.java @@ -42,6 +42,7 @@ public final class CraftScoreboardManager implements ScoreboardManager { diff --git a/CraftBukkit-Patches/0010-Spigot-Timings.patch b/CraftBukkit-Patches/0010-Spigot-Timings.patch index 1cd811edf6..bd2a83edb5 100644 --- a/CraftBukkit-Patches/0010-Spigot-Timings.patch +++ b/CraftBukkit-Patches/0010-Spigot-Timings.patch @@ -1,4 +1,4 @@ -From 8a0b89b0df0a22cc1ff24b60939922b4b1530e4b Mon Sep 17 00:00:00 2001 +From 51119718d82e46e53f83f254ff0bd8f04fe3da90 Mon Sep 17 00:00:00 2001 From: Aikar Date: Thu, 10 Jan 2013 00:18:11 -0500 Subject: [PATCH] Spigot Timings @@ -160,10 +160,10 @@ index e81a958..6e125e7 100644 public void recalcPosition() { diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java -index 9b73738..dc1f1a7 100644 +index 73caf4e..aca2c60 100644 --- a/src/main/java/net/minecraft/server/EntityLiving.java +++ b/src/main/java/net/minecraft/server/EntityLiving.java -@@ -23,6 +23,8 @@ import org.bukkit.event.entity.EntityRegainHealthEvent; +@@ -24,6 +24,8 @@ import org.bukkit.event.entity.EntityRegainHealthEvent; import org.bukkit.event.player.PlayerItemConsumeEvent; // CraftBukkit end @@ -172,7 +172,7 @@ index 9b73738..dc1f1a7 100644 public abstract class EntityLiving extends Entity { private static final UUID a = UUID.fromString("662A6B8D-DA3E-4C1C-8813-96EA6097278D"); -@@ -1673,6 +1675,7 @@ public abstract class EntityLiving extends Entity { +@@ -1675,6 +1677,7 @@ public abstract class EntityLiving extends Entity { } public void m() { @@ -180,7 +180,7 @@ index 9b73738..dc1f1a7 100644 super.m(); this.cu(); if (!this.world.isClientSide) { -@@ -1745,7 +1748,9 @@ public abstract class EntityLiving extends Entity { +@@ -1747,7 +1750,9 @@ public abstract class EntityLiving extends Entity { } } @@ -190,7 +190,7 @@ index 9b73738..dc1f1a7 100644 double d0 = this.locX - this.lastX; double d1 = this.locZ - this.lastZ; float f = (float) (d0 * d0 + d1 * d1); -@@ -1815,6 +1820,7 @@ public abstract class EntityLiving extends Entity { +@@ -1817,6 +1822,7 @@ public abstract class EntityLiving extends Entity { this.bo = 0; } @@ -198,7 +198,7 @@ index 9b73738..dc1f1a7 100644 } protected float h(float f, float f1) { -@@ -1879,6 +1885,7 @@ public abstract class EntityLiving extends Entity { +@@ -1881,6 +1887,7 @@ public abstract class EntityLiving extends Entity { } this.world.methodProfiler.a("ai"); @@ -206,7 +206,7 @@ index 9b73738..dc1f1a7 100644 if (this.cf()) { this.bc = false; this.bd = 0.0F; -@@ -1889,6 +1896,7 @@ public abstract class EntityLiving extends Entity { +@@ -1891,6 +1898,7 @@ public abstract class EntityLiving extends Entity { this.doTick(); this.world.methodProfiler.b(); } @@ -214,7 +214,7 @@ index 9b73738..dc1f1a7 100644 this.world.methodProfiler.b(); this.world.methodProfiler.a("jump"); -@@ -1911,10 +1919,14 @@ public abstract class EntityLiving extends Entity { +@@ -1913,10 +1921,14 @@ public abstract class EntityLiving extends Entity { this.be *= 0.98F; this.bf *= 0.9F; this.r(); @@ -407,7 +407,7 @@ index baf1d73..8bbdc11 100644 private static Map> f = Maps.newHashMap(); private static Map, String> g = Maps.newHashMap(); diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java -index e0416a8..5b38491 100644 +index c73f0ef..d6d4c5b 100644 --- a/src/main/java/net/minecraft/server/World.java +++ b/src/main/java/net/minecraft/server/World.java @@ -18,6 +18,7 @@ import com.google.common.collect.Maps; @@ -464,7 +464,7 @@ index e0416a8..5b38491 100644 @@ -1395,6 +1403,7 @@ 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/0014-Entity-Activation-Range.patch b/CraftBukkit-Patches/0014-Entity-Activation-Range.patch index 83cb808657..9bbec6ad23 100644 --- a/CraftBukkit-Patches/0014-Entity-Activation-Range.patch +++ b/CraftBukkit-Patches/0014-Entity-Activation-Range.patch @@ -1,4 +1,4 @@ -From c02726daf6071087cb6812fae4cdd483f839bb74 Mon Sep 17 00:00:00 2001 +From a6fd76ee6c1cba5ed83ed03042318c5f58fc25a6 Mon Sep 17 00:00:00 2001 From: Aikar Date: Sun, 3 Feb 2013 05:10:21 -0500 Subject: [PATCH] Entity Activation Range @@ -168,10 +168,10 @@ index eb0f8eb..39af5d5 100644 // Spigot start double radius = world.spigotConfig.itemMerge; diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java -index dc1f1a7..a65ecb9 100644 +index aca2c60..96a0571 100644 --- a/src/main/java/net/minecraft/server/EntityLiving.java +++ b/src/main/java/net/minecraft/server/EntityLiving.java -@@ -103,6 +103,13 @@ public abstract class EntityLiving extends Entity { +@@ -104,6 +104,13 @@ public abstract class EntityLiving extends Entity { ArrayList drops = new ArrayList(); public org.bukkit.craftbukkit.attribute.CraftAttributeMap craftAttributes; // CraftBukkit end @@ -186,7 +186,7 @@ index dc1f1a7..a65ecb9 100644 public void Q() { this.damageEntity(DamageSource.OUT_OF_WORLD, Float.MAX_VALUE); diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java -index b828c9b..9bbf06e 100644 +index 73c31a3..559dd75 100644 --- a/src/main/java/net/minecraft/server/World.java +++ b/src/main/java/net/minecraft/server/World.java @@ -1336,6 +1336,7 @@ public abstract class World implements IBlockAccess { diff --git a/CraftBukkit-Patches/0035-Player-Collision-API.patch b/CraftBukkit-Patches/0035-Player-Collision-API.patch index c7597deb50..9317944ed8 100644 --- a/CraftBukkit-Patches/0035-Player-Collision-API.patch +++ b/CraftBukkit-Patches/0035-Player-Collision-API.patch @@ -1,14 +1,14 @@ -From 702a638cb831bb4d5b650c9622d0eb83c5dc0db9 Mon Sep 17 00:00:00 2001 +From b4fc682655ad6d28c1c0a18306244a6e6daa8bf3 Mon Sep 17 00:00:00 2001 From: md_5 Date: Sat, 3 Aug 2013 19:27:07 +1000 Subject: [PATCH] Player Collision API diff --git a/src/main/java/net/minecraft/server/EntityHuman.java b/src/main/java/net/minecraft/server/EntityHuman.java -index 00782c1..9042a4c 100644 +index f0a757a..41619c1 100644 --- a/src/main/java/net/minecraft/server/EntityHuman.java +++ b/src/main/java/net/minecraft/server/EntityHuman.java -@@ -376,6 +376,7 @@ public abstract class EntityHuman extends EntityLiving { +@@ -377,6 +377,7 @@ public abstract class EntityHuman extends EntityLiving { List list = this.world.getEntities(this, axisalignedbb); @@ -16,7 +16,7 @@ index 00782c1..9042a4c 100644 for (int i = 0; i < list.size(); ++i) { Entity entity = (Entity) list.get(i); -@@ -383,6 +384,7 @@ public abstract class EntityHuman extends EntityLiving { +@@ -384,6 +385,7 @@ public abstract class EntityHuman extends EntityLiving { this.c(entity); } } @@ -25,10 +25,10 @@ index 00782c1..9042a4c 100644 } diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java -index a65ecb9..585ec6a 100644 +index 96a0571..7a0f06a 100644 --- a/src/main/java/net/minecraft/server/EntityLiving.java +++ b/src/main/java/net/minecraft/server/EntityLiving.java -@@ -1966,7 +1966,7 @@ public abstract class EntityLiving extends Entity { +@@ -1969,7 +1969,7 @@ public abstract class EntityLiving extends Entity { protected void cn() { List list = this.world.a((Entity) this, this.getBoundingBox(), IEntitySelector.a(this)); @@ -38,7 +38,7 @@ index a65ecb9..585ec6a 100644 Entity entity = (Entity) list.get(i); // TODO better check now? diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java -index b0af79b..e0f11d3 100644 +index 4e34d45..688b359 100644 --- a/src/main/java/net/minecraft/server/EntityPlayer.java +++ b/src/main/java/net/minecraft/server/EntityPlayer.java @@ -65,6 +65,21 @@ public class EntityPlayer extends EntityHuman implements ICrafting { diff --git a/CraftBukkit-Patches/0069-Cap-Entity-Collisions.patch b/CraftBukkit-Patches/0069-Cap-Entity-Collisions.patch index a73e9bc19f..49c8d55c45 100644 --- a/CraftBukkit-Patches/0069-Cap-Entity-Collisions.patch +++ b/CraftBukkit-Patches/0069-Cap-Entity-Collisions.patch @@ -1,4 +1,4 @@ -From 09871ed0272d617d98524cdc2f286f4dcca3146a Mon Sep 17 00:00:00 2001 +From 27cef0d51daf007d8d142833a8ff15c9c2186581 Mon Sep 17 00:00:00 2001 From: Aikar Date: Fri, 31 Jan 2014 11:18:34 -0500 Subject: [PATCH] Cap Entity Collisions @@ -19,10 +19,10 @@ index a782867..c982151 100644 public Entity(World world) { diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java -index 585ec6a..ec5b0cb 100644 +index 7a0f06a..89b2eb0 100644 --- a/src/main/java/net/minecraft/server/EntityLiving.java +++ b/src/main/java/net/minecraft/server/EntityLiving.java -@@ -1967,7 +1967,8 @@ public abstract class EntityLiving extends Entity { +@@ -1970,7 +1970,8 @@ public abstract class EntityLiving extends Entity { List list = this.world.a((Entity) this, this.getBoundingBox(), IEntitySelector.a(this)); if (this.isInteractable() && !list.isEmpty()) { // Spigot: Add isInteractable() condition @@ -32,7 +32,7 @@ index 585ec6a..ec5b0cb 100644 Entity entity = (Entity) list.get(i); // TODO better check now? // CraftBukkit start - Only handle mob (non-player) collisions every other tick -@@ -1976,7 +1977,8 @@ public abstract class EntityLiving extends Entity { +@@ -1979,7 +1980,8 @@ public abstract class EntityLiving extends Entity { } // CraftBukkit end diff --git a/CraftBukkit-Patches/0132-Add-Hunger-Config-Values.patch b/CraftBukkit-Patches/0132-Add-Hunger-Config-Values.patch index 777614924f..a10a2f65ba 100644 --- a/CraftBukkit-Patches/0132-Add-Hunger-Config-Values.patch +++ b/CraftBukkit-Patches/0132-Add-Hunger-Config-Values.patch @@ -1,14 +1,14 @@ -From f4ccb379ee5457463118ae895531ad4eab1bd9b4 Mon Sep 17 00:00:00 2001 +From ab1a2c66d0382cb2bf7fe5413578a1482cf564e6 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 9042a4c..11fdee8 100644 +index 41619c1..6e40e60 100644 --- a/src/main/java/net/minecraft/server/EntityHuman.java +++ b/src/main/java/net/minecraft/server/EntityHuman.java -@@ -1139,7 +1139,7 @@ public abstract class EntityHuman extends EntityLiving { +@@ -1140,7 +1140,7 @@ public abstract class EntityHuman extends EntityLiving { } } @@ -17,7 +17,7 @@ index 9042a4c..11fdee8 100644 } else { this.world.a((EntityHuman) null, this.locX, this.locY, this.locZ, SoundEffects.dY, this.bz(), 1.0F, 1.0F); if (flag4) { -@@ -1406,9 +1406,9 @@ public abstract class EntityHuman extends EntityLiving { +@@ -1407,9 +1407,9 @@ public abstract class EntityHuman extends EntityLiving { super.ch(); this.b(StatisticList.w); if (this.isSprinting()) { diff --git a/CraftBukkit-Patches/0149-Implement-SpawnerSpawnEvent.patch b/CraftBukkit-Patches/0149-Implement-SpawnerSpawnEvent.patch index e57ba4a355..4b360bbc89 100644 --- a/CraftBukkit-Patches/0149-Implement-SpawnerSpawnEvent.patch +++ b/CraftBukkit-Patches/0149-Implement-SpawnerSpawnEvent.patch @@ -1,4 +1,4 @@ -From 071fbaa33adc4fca64ef162952ad4f5eccfb1a10 Mon Sep 17 00:00:00 2001 +From 3915e4f8fec3e645a5a878c319dd15ff836a3528 Mon Sep 17 00:00:00 2001 From: md_5 Date: Thu, 3 Mar 2016 19:45:46 +1100 Subject: [PATCH] Implement SpawnerSpawnEvent. @@ -19,14 +19,13 @@ index efe792b..a7903a2 100644 ChunkRegionLoader.a(entity, world, org.bukkit.event.entity.CreatureSpawnEvent.SpawnReason.SPAWNER); // CraftBukkit 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 5083875..c9ff812 100644 +index 3b7243b..f99b01f 100644 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java -@@ -984,4 +984,19 @@ public class CraftEventFactory { - event.getInventory().setItem(2, event.getResult()); +@@ -985,6 +985,21 @@ public class CraftEventFactory { return event; } -+ + + /** + * Mob spawner event. + */ @@ -41,7 +40,10 @@ index 5083875..c9ff812 100644 + 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); -- 2.5.0