From 5d4ed8047a49efef46f6f69aff685caa44d56016 Mon Sep 17 00:00:00 2001 From: Thinkofdeath Date: Wed, 30 Apr 2014 15:13:37 +0100 Subject: [PATCH] Upstream merge: Chicken jockey despawning and generation fixes --- Bukkit | 2 +- CraftBukkit | 2 +- .../0003-Skeleton-API-Implementations.patch | 6 +++--- CraftBukkit-Patches/0044-Player-Collision-API.patch | 6 +++--- CraftBukkit-Patches/0071-Particle-API.patch | 8 ++++---- .../0075-Add-Option-to-Nerf-Mobs-from-Spawner-s.patch | 6 +++--- CraftBukkit-Patches/0095-Cap-Entity-Collisions.patch | 8 ++++---- .../0104-Implement-Silenceable-Lightning-API.patch | 6 +++--- 8 files changed, 22 insertions(+), 22 deletions(-) diff --git a/Bukkit b/Bukkit index 41d9f93da..b9a0f9759 160000 --- a/Bukkit +++ b/Bukkit @@ -1 +1 @@ -Subproject commit 41d9f93da702dd486e731bad6c08a752ba0c5a89 +Subproject commit b9a0f9759d42f49f2ce23524f8f3d9d185fdb260 diff --git a/CraftBukkit b/CraftBukkit index 6efeddfe5..8356f65da 160000 --- a/CraftBukkit +++ b/CraftBukkit @@ -1 +1 @@ -Subproject commit 6efeddfe5779931ac3b272010022a41a1c39f1d6 +Subproject commit 8356f65daa8e01bbb33b4c6345b6724ee991502b diff --git a/CraftBukkit-Patches/0003-Skeleton-API-Implementations.patch b/CraftBukkit-Patches/0003-Skeleton-API-Implementations.patch index 5dc468af5..dd1e6e9cb 100644 --- a/CraftBukkit-Patches/0003-Skeleton-API-Implementations.patch +++ b/CraftBukkit-Patches/0003-Skeleton-API-Implementations.patch @@ -1,14 +1,14 @@ -From 8a4ee6ed2b429e8fd918e873729b38b208c19422 Mon Sep 17 00:00:00 2001 +From 59b4d5f7a05bcd2a37573713843d2598e069e38e Mon Sep 17 00:00:00 2001 From: md_5 Date: Sun, 2 Jun 2013 15:10:56 +1000 Subject: [PATCH] Skeleton API Implementations diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java -index 8ef5509..c7c6a6f 100644 +index 9bc72aa..fc3aece 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java -@@ -1310,4 +1310,14 @@ public class CraftWorld implements World { +@@ -1313,4 +1313,14 @@ public class CraftWorld implements World { cps.queueUnload(chunk.locX, chunk.locZ); } } diff --git a/CraftBukkit-Patches/0044-Player-Collision-API.patch b/CraftBukkit-Patches/0044-Player-Collision-API.patch index b4b3f07f8..871e60ebe 100644 --- a/CraftBukkit-Patches/0044-Player-Collision-API.patch +++ b/CraftBukkit-Patches/0044-Player-Collision-API.patch @@ -1,4 +1,4 @@ -From 35608171284d5462cc9a5e0cceb58c311bdc6bbb Mon Sep 17 00:00:00 2001 +From 7b8655419021c68c1b8801b3a7ed96216c38e776 Mon Sep 17 00:00:00 2001 From: md_5 Date: Sat, 3 Aug 2013 19:27:07 +1000 Subject: [PATCH] Player Collision API @@ -18,10 +18,10 @@ index 1fc7a22..d091bcf 100644 Entity entity = (Entity) list.get(i); diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java -index 6c77253..4c3fd8a 100644 +index 403489e..dad8964 100644 --- a/src/main/java/net/minecraft/server/EntityLiving.java +++ b/src/main/java/net/minecraft/server/EntityLiving.java -@@ -1490,7 +1490,7 @@ public abstract class EntityLiving extends Entity { +@@ -1494,7 +1494,7 @@ public abstract class EntityLiving extends Entity { protected void bn() { List list = this.world.getEntities(this, this.boundingBox.grow(0.20000000298023224D, 0.0D, 0.20000000298023224D)); diff --git a/CraftBukkit-Patches/0071-Particle-API.patch b/CraftBukkit-Patches/0071-Particle-API.patch index 931e01692..ae8b6d4a6 100644 --- a/CraftBukkit-Patches/0071-Particle-API.patch +++ b/CraftBukkit-Patches/0071-Particle-API.patch @@ -1,4 +1,4 @@ -From bc6f8371fb5e19fb85b9906114623ee141fb3baf Mon Sep 17 00:00:00 2001 +From c2fcfa5b972d14089d629654b57408def309f9f2 Mon Sep 17 00:00:00 2001 From: Thinkofdeath Date: Fri, 20 Dec 2013 21:36:06 +0000 Subject: [PATCH] Particle API @@ -18,10 +18,10 @@ index 7de0de5..7eca388 100644 datavalue = 0; } diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java -index 452f6f3..a36297d 100644 +index 81913ac..1317254 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java -@@ -805,28 +805,18 @@ public class CraftWorld implements World { +@@ -808,28 +808,18 @@ public class CraftWorld implements World { Validate.isTrue(effect.getData() == null, "Wrong kind of data for this effect!"); } @@ -59,7 +59,7 @@ index 452f6f3..a36297d 100644 } public T spawn(Location location, Class clazz) throws IllegalArgumentException { -@@ -1316,6 +1306,56 @@ public class CraftWorld implements World { +@@ -1319,6 +1309,56 @@ public class CraftWorld implements World { // Spigot start private final Spigot spigot = new Spigot() { diff --git a/CraftBukkit-Patches/0075-Add-Option-to-Nerf-Mobs-from-Spawner-s.patch b/CraftBukkit-Patches/0075-Add-Option-to-Nerf-Mobs-from-Spawner-s.patch index 90805d64f..630b21481 100644 --- a/CraftBukkit-Patches/0075-Add-Option-to-Nerf-Mobs-from-Spawner-s.patch +++ b/CraftBukkit-Patches/0075-Add-Option-to-Nerf-Mobs-from-Spawner-s.patch @@ -1,4 +1,4 @@ -From c1894b57a43af9b0b3cf069d03b82c990e27f08c Mon Sep 17 00:00:00 2001 +From a50f4baccd5284833cff597dad3bdaa0f3ee471d Mon Sep 17 00:00:00 2001 From: md_5 Date: Sun, 2 Feb 2014 16:55:46 +0000 Subject: [PATCH] Add Option to Nerf Mobs from Spawner's @@ -17,10 +17,10 @@ index 998fd36..c4bdccf 100644 // Spigot end diff --git a/src/main/java/net/minecraft/server/EntityInsentient.java b/src/main/java/net/minecraft/server/EntityInsentient.java -index 7079ed7..ef81600 100644 +index 11450ac..e146143 100644 --- a/src/main/java/net/minecraft/server/EntityInsentient.java +++ b/src/main/java/net/minecraft/server/EntityInsentient.java -@@ -417,6 +417,12 @@ public abstract class EntityInsentient extends EntityLiving { +@@ -425,6 +425,12 @@ public abstract class EntityInsentient extends EntityLiving { this.world.methodProfiler.a("checkDespawn"); this.w(); this.world.methodProfiler.b(); diff --git a/CraftBukkit-Patches/0095-Cap-Entity-Collisions.patch b/CraftBukkit-Patches/0095-Cap-Entity-Collisions.patch index 8c37b199e..3267b19fc 100644 --- a/CraftBukkit-Patches/0095-Cap-Entity-Collisions.patch +++ b/CraftBukkit-Patches/0095-Cap-Entity-Collisions.patch @@ -1,4 +1,4 @@ -From 42e14e927828be9932f627f80ad68977387cba90 Mon Sep 17 00:00:00 2001 +From d5d17c04b5a9c0f672c267ab36b7dc15eb1dcd2d 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 c4bdccf..c542460 100644 if (entity.passenger != this && entity.vehicle != this) { double d0 = entity.locX - this.locX; diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java -index 4c3fd8a..f531103 100644 +index dad8964..234d7db 100644 --- a/src/main/java/net/minecraft/server/EntityLiving.java +++ b/src/main/java/net/minecraft/server/EntityLiving.java -@@ -1491,7 +1491,9 @@ public abstract class EntityLiving extends Entity { +@@ -1495,7 +1495,9 @@ public abstract class EntityLiving extends Entity { List list = this.world.getEntities(this, this.boundingBox.grow(0.20000000298023224D, 0.0D, 0.20000000298023224D)); if (this.R() && list != null && !list.isEmpty()) { // Spigot: Add this.R() condition @@ -32,7 +32,7 @@ index 4c3fd8a..f531103 100644 Entity entity = (Entity) list.get(i); // TODO better check now? -@@ -1502,9 +1504,12 @@ public abstract class EntityLiving extends Entity { +@@ -1506,9 +1508,12 @@ public abstract class EntityLiving extends Entity { // CraftBukkit end if (entity.R()) { diff --git a/CraftBukkit-Patches/0104-Implement-Silenceable-Lightning-API.patch b/CraftBukkit-Patches/0104-Implement-Silenceable-Lightning-API.patch index 80f656a91..9ed66c514 100644 --- a/CraftBukkit-Patches/0104-Implement-Silenceable-Lightning-API.patch +++ b/CraftBukkit-Patches/0104-Implement-Silenceable-Lightning-API.patch @@ -1,4 +1,4 @@ -From 2995956023d62fcda1edc0d7f2f26450e8cd6646 Mon Sep 17 00:00:00 2001 +From ab9d03a7e3cf7aa9922ce671434c106a12635755 Mon Sep 17 00:00:00 2001 From: drXor Date: Sun, 23 Feb 2014 16:16:59 -0400 Subject: [PATCH] Implement Silenceable Lightning API @@ -37,10 +37,10 @@ index 2fd88c0..35806d1 100644 this.world.makeSound(this.locX, this.locY, this.locZ, "random.explode", 2.0F, 0.5F + 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 a36297d..ac2b41a 100644 +index 1317254..89393ff 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java -@@ -1356,6 +1356,22 @@ public class CraftWorld implements World { +@@ -1359,6 +1359,22 @@ public class CraftWorld implements World { { CraftWorld.this.playEffect( location, effect, 0 ); }