From ed8119ad4da92e9706eda68e45588a5b555bf4e8 Mon Sep 17 00:00:00 2001 From: Zach Brown Date: Thu, 18 Dec 2014 17:35:10 -0600 Subject: [PATCH] Rebuild our patches for upstream changes --- ...0003-Stop-using-spigot-s-website-for-timings.patch | 6 +++--- Spigot-Server-Patches/0001-POM-changes.patch | 11 +++++------ .../0005-Teleport-passenger-vehicle-with-player.patch | 8 ++++---- .../0024-Player-affects-spawning-API.patch | 6 +++--- .../0037-Add-async-chunk-load-API.patch | 6 +++--- .../0040-Add-TNT-source-location-API.patch | 6 +++--- 6 files changed, 21 insertions(+), 22 deletions(-) diff --git a/Spigot-API-Patches/0003-Stop-using-spigot-s-website-for-timings.patch b/Spigot-API-Patches/0003-Stop-using-spigot-s-website-for-timings.patch index 27677b9e26..4db951e4a9 100644 --- a/Spigot-API-Patches/0003-Stop-using-spigot-s-website-for-timings.patch +++ b/Spigot-API-Patches/0003-Stop-using-spigot-s-website-for-timings.patch @@ -1,4 +1,4 @@ -From 26bc003c330544b2ff61c6ab19aa2f45030d1917 Mon Sep 17 00:00:00 2001 +From b20199c2ef1d64e19d52153ba65fe5bfbddad752 Mon Sep 17 00:00:00 2001 From: Zach Brown Date: Mon, 28 Jul 2014 03:26:50 -0500 Subject: [PATCH] Stop using spigot's website for timings @@ -6,7 +6,7 @@ Subject: [PATCH] Stop using spigot's website for timings There's no reason to do so at all, the fact that it just exists as a redirect is both odd and unnecessary diff --git a/src/main/java/org/bukkit/command/defaults/TimingsCommand.java b/src/main/java/org/bukkit/command/defaults/TimingsCommand.java -index 7907021..94ce5dc 100644 +index 552dabb..a652e87 100644 --- a/src/main/java/org/bukkit/command/defaults/TimingsCommand.java +++ b/src/main/java/org/bukkit/command/defaults/TimingsCommand.java @@ -94,7 +94,7 @@ public class TimingsCommand extends BukkitCommand { @@ -18,7 +18,7 @@ index 7907021..94ce5dc 100644 } catch (IOException e) { } finally { -@@ -238,7 +238,7 @@ public class TimingsCommand extends BukkitCommand { +@@ -241,7 +241,7 @@ public class TimingsCommand extends BukkitCommand { String location = con.getHeaderField( "Location" ); String pasteID = location.substring( "http://paste.ubuntu.com/".length(), location.length() - 1 ); diff --git a/Spigot-Server-Patches/0001-POM-changes.patch b/Spigot-Server-Patches/0001-POM-changes.patch index fff72fd970..5d81f58249 100644 --- a/Spigot-Server-Patches/0001-POM-changes.patch +++ b/Spigot-Server-Patches/0001-POM-changes.patch @@ -1,11 +1,11 @@ -From 93cd9e19c9d5e34307b2d64ad5a223f237f78d02 Mon Sep 17 00:00:00 2001 +From 6583416e72c4ceb57406359416451c04aab399d6 Mon Sep 17 00:00:00 2001 From: Zach Brown Date: Fri, 5 Dec 2014 22:04:50 -0600 Subject: [PATCH] POM changes diff --git a/pom.xml b/pom.xml -index 4e6f620..f2a404c 100644 +index dc1d420..a5d7d0d 100644 --- a/pom.xml +++ b/pom.xml @@ -1,12 +1,12 @@ @@ -25,7 +25,7 @@ index 4e6f620..f2a404c 100644 UTF-8 -@@ -19,8 +19,8 @@ +@@ -19,16 +19,16 @@ @@ -36,7 +36,6 @@ index 4e6f620..f2a404c 100644 dev-SNAPSHOT ../pom.xml -@@ -41,8 +41,8 @@ @@ -47,7 +46,7 @@ index 4e6f620..f2a404c 100644 ${project.version} jar compile -@@ -144,12 +144,12 @@ +@@ -103,12 +103,12 @@ @@ -63,7 +62,7 @@ index 4e6f620..f2a404c 100644 compile -@@ -180,7 +180,7 @@ +@@ -139,7 +139,7 @@ org.bukkit.craftbukkit.Main CraftBukkit diff --git a/Spigot-Server-Patches/0005-Teleport-passenger-vehicle-with-player.patch b/Spigot-Server-Patches/0005-Teleport-passenger-vehicle-with-player.patch index ee7ab7df25..97829174e3 100644 --- a/Spigot-Server-Patches/0005-Teleport-passenger-vehicle-with-player.patch +++ b/Spigot-Server-Patches/0005-Teleport-passenger-vehicle-with-player.patch @@ -1,4 +1,4 @@ -From b8780a9816233ecf0d111d9ac45042bd32775eaf Mon Sep 17 00:00:00 2001 +From 24ce57040df90c39be31435c7fcfd6cd47e48af2 Mon Sep 17 00:00:00 2001 From: Aikar Date: Fri, 28 Nov 2014 00:24:18 -0600 Subject: [PATCH] Teleport passenger/vehicle with player @@ -43,10 +43,10 @@ index 2cca633..dcbc6b5 100644 if (j == 1 && i == 1) { BlockPosition blockposition = this.world.r(worldserver1.getSpawn()); diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -index cb65795..5802707 100644 +index 9167baf..04a2622 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -@@ -452,7 +452,27 @@ public class CraftPlayer extends CraftHumanEntity implements Player { +@@ -455,7 +455,27 @@ public class CraftPlayer extends CraftHumanEntity implements Player { } // If this player is riding another entity, we must dismount before teleporting. @@ -75,7 +75,7 @@ index cb65795..5802707 100644 // Update the From Location from = event.getFrom(); -@@ -473,6 +493,17 @@ public class CraftPlayer extends CraftHumanEntity implements Player { +@@ -476,6 +496,17 @@ public class CraftPlayer extends CraftHumanEntity implements Player { } else { server.getHandle().moveToWorld(entity, toWorld.dimension, true, to, true); } diff --git a/Spigot-Server-Patches/0024-Player-affects-spawning-API.patch b/Spigot-Server-Patches/0024-Player-affects-spawning-API.patch index 21a60ad124..548cdd7795 100644 --- a/Spigot-Server-Patches/0024-Player-affects-spawning-API.patch +++ b/Spigot-Server-Patches/0024-Player-affects-spawning-API.patch @@ -1,4 +1,4 @@ -From 9264fb0fc4074c31618ea8711a47b0ccac364ed1 Mon Sep 17 00:00:00 2001 +From f5c3a5a5da3f65c4ce49e99c9d595075a09041e6 Mon Sep 17 00:00:00 2001 From: Jedediah Smith Date: Fri, 28 Nov 2014 03:31:21 -0600 Subject: [PATCH] Player affects spawning API @@ -146,10 +146,10 @@ index 3cc9c2e..031a906 100644 for (int i = 0; i < this.players.size(); ++i) { EntityHuman entityhuman = (EntityHuman) this.players.get(i); diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -index 5802707..4559d97 100644 +index 04a2622..fca7893 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -@@ -1473,6 +1473,16 @@ public class CraftPlayer extends CraftHumanEntity implements Player { +@@ -1476,6 +1476,16 @@ public class CraftPlayer extends CraftHumanEntity implements Player { packet.components = components; getHandle().playerConnection.sendPacket(packet); } diff --git a/Spigot-Server-Patches/0037-Add-async-chunk-load-API.patch b/Spigot-Server-Patches/0037-Add-async-chunk-load-API.patch index 2a28e5ed77..eb8a51e9ef 100644 --- a/Spigot-Server-Patches/0037-Add-async-chunk-load-API.patch +++ b/Spigot-Server-Patches/0037-Add-async-chunk-load-API.patch @@ -1,14 +1,14 @@ -From db86ee788914fcad73bf309cd9f8bfc65f05d03e Mon Sep 17 00:00:00 2001 +From 80e5f75d95d552867bd9a5622b5cab4d47e30614 Mon Sep 17 00:00:00 2001 From: Aikar Date: Thu, 6 Nov 2014 18:29:20 -0600 Subject: [PATCH] Add async chunk load API diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java -index e4ee220..562f057 100644 +index c6ef0fd..2a42eff 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java -@@ -119,6 +119,24 @@ public class CraftWorld implements World { +@@ -120,6 +120,24 @@ public class CraftWorld implements World { } } diff --git a/Spigot-Server-Patches/0040-Add-TNT-source-location-API.patch b/Spigot-Server-Patches/0040-Add-TNT-source-location-API.patch index aaec2191ff..9f50473251 100644 --- a/Spigot-Server-Patches/0040-Add-TNT-source-location-API.patch +++ b/Spigot-Server-Patches/0040-Add-TNT-source-location-API.patch @@ -1,4 +1,4 @@ -From bb79ef26be9066a993bc21a81a53161e75596914 Mon Sep 17 00:00:00 2001 +From f98008a45418decdfd9e5431a19b0db37a5c8102 Mon Sep 17 00:00:00 2001 From: Aikar Date: Sun, 30 Nov 2014 22:57:18 -0600 Subject: [PATCH] Add TNT source location API @@ -98,10 +98,10 @@ index b5763bb..611bac8 100644 public EntityLiving getSource() { diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java -index 562f057..405920a 100644 +index 2a42eff..870ac0c 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java -@@ -1063,7 +1063,8 @@ public class CraftWorld implements World { +@@ -1090,7 +1090,8 @@ public class CraftWorld implements World { throw new IllegalArgumentException("Cannot spawn hanging entity for " + clazz.getName() + " at " + location); } } else if (TNTPrimed.class.isAssignableFrom(clazz)) {