core
/
testserver
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Rebuild our patches for upstream changes

This commit is contained in:
Zach Brown 2014-12-18 17:35:10 -06:00
parent 6a5e553feb
commit ed8119ad4d
6 changed files with 21 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Spigot-API-Patches/0003-Stop-using-spigot-s-website-for-timings.patch
View File

@ -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 <Zbob750@live.com> From: Zach Brown <Zbob750@live.com>
Date: Mon, 28 Jul 2014 03:26:50 -0500 Date: Mon, 28 Jul 2014 03:26:50 -0500
Subject: [PATCH] Stop using spigot's website for timings 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 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 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 --- a/src/main/java/org/bukkit/command/defaults/TimingsCommand.java
+++ b/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 { @@ -94,7 +94,7 @@ public class TimingsCommand extends BukkitCommand {
@ -18,7 +18,7 @@ index 7907021..94ce5dc 100644
} catch (IOException e) { } catch (IOException e) {
} finally { } 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 location = con.getHeaderField( "Location" );
String pasteID = location.substring( "http://paste.ubuntu.com/".length(), location.length() - 1 ); String pasteID = location.substring( "http://paste.ubuntu.com/".length(), location.length() - 1 );

11
Spigot-Server-Patches/0001-POM-changes.patch
View File

@ -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 <Zbob750@live.com> From: Zach Brown <Zbob750@live.com>
Date: Fri, 5 Dec 2014 22:04:50 -0600 Date: Fri, 5 Dec 2014 22:04:50 -0600
Subject: [PATCH] POM changes Subject: [PATCH] POM changes
diff --git a/pom.xml b/pom.xml diff --git a/pom.xml b/pom.xml
index 4e6f620..f2a404c 100644 index dc1d420..a5d7d0d 100644
--- a/pom.xml --- a/pom.xml
+++ b/pom.xml +++ b/pom.xml
@@ -1,12 +1,12 @@ @@ -1,12 +1,12 @@
@ -25,7 +25,7 @@ index 4e6f620..f2a404c 100644
<properties> <properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -19,8 +19,8 @@ @@ -19,16 +19,16 @@
</properties> </properties>
<parent> <parent>
@ -36,7 +36,6 @@ index 4e6f620..f2a404c 100644
<version>dev-SNAPSHOT</version> <version>dev-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath> <relativePath>../pom.xml</relativePath>
</parent> </parent>
@@ -41,8 +41,8 @@
<dependencies> <dependencies>
<dependency> <dependency>
@ -47,7 +46,7 @@ index 4e6f620..f2a404c 100644
<version>${project.version}</version> <version>${project.version}</version>
<type>jar</type> <type>jar</type>
<scope>compile</scope> <scope>compile</scope>
@@ -144,12 +144,12 @@ @@ -103,12 +103,12 @@
</configuration> </configuration>
<executions> <executions>
<execution> <execution>
@ -63,7 +62,7 @@ index 4e6f620..f2a404c 100644
</configuration> </configuration>
<phase>compile</phase> <phase>compile</phase>
<goals> <goals>
@@ -180,7 +180,7 @@ @@ -139,7 +139,7 @@
<manifestEntries> <manifestEntries>
<Main-Class>org.bukkit.craftbukkit.Main</Main-Class> <Main-Class>org.bukkit.craftbukkit.Main</Main-Class>
<Implementation-Title>CraftBukkit</Implementation-Title> <Implementation-Title>CraftBukkit</Implementation-Title>

8
Spigot-Server-Patches/0005-Teleport-passenger-vehicle-with-player.patch
View File

@ -1,4 +1,4 @@
From b8780a9816233ecf0d111d9ac45042bd32775eaf Mon Sep 17 00:00:00 2001 From 24ce57040df90c39be31435c7fcfd6cd47e48af2 Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co> From: Aikar <aikar@aikar.co>
Date: Fri, 28 Nov 2014 00:24:18 -0600 Date: Fri, 28 Nov 2014 00:24:18 -0600
Subject: [PATCH] Teleport passenger/vehicle with player Subject: [PATCH] Teleport passenger/vehicle with player
@ -43,10 +43,10 @@ index 2cca633..dcbc6b5 100644
if (j == 1 && i == 1) { if (j == 1 && i == 1) {
BlockPosition blockposition = this.world.r(worldserver1.getSpawn()); 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 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 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/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. // If this player is riding another entity, we must dismount before teleporting.
@ -75,7 +75,7 @@ index cb65795..5802707 100644
// Update the From Location // Update the From Location
from = event.getFrom(); 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 { } else {
server.getHandle().moveToWorld(entity, toWorld.dimension, true, to, true); server.getHandle().moveToWorld(entity, toWorld.dimension, true, to, true);
} }

6
Spigot-Server-Patches/0024-Player-affects-spawning-API.patch
View File

@ -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 <jedediah@silencegreys.com> From: Jedediah Smith <jedediah@silencegreys.com>
Date: Fri, 28 Nov 2014 03:31:21 -0600 Date: Fri, 28 Nov 2014 03:31:21 -0600
Subject: [PATCH] Player affects spawning API Subject: [PATCH] Player affects spawning API
@ -146,10 +146,10 @@ index 3cc9c2e..031a906 100644
for (int i = 0; i < this.players.size(); ++i) { for (int i = 0; i < this.players.size(); ++i) {
EntityHuman entityhuman = (EntityHuman) this.players.get(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 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 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/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; packet.components = components;
getHandle().playerConnection.sendPacket(packet); getHandle().playerConnection.sendPacket(packet);
} }

6
Spigot-Server-Patches/0037-Add-async-chunk-load-API.patch
View File

@ -1,14 +1,14 @@
From db86ee788914fcad73bf309cd9f8bfc65f05d03e Mon Sep 17 00:00:00 2001 From 80e5f75d95d552867bd9a5622b5cab4d47e30614 Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co> From: Aikar <aikar@aikar.co>
Date: Thu, 6 Nov 2014 18:29:20 -0600 Date: Thu, 6 Nov 2014 18:29:20 -0600
Subject: [PATCH] Add async chunk load API 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 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 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
+++ b/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 {
} }
} }

6
Spigot-Server-Patches/0040-Add-TNT-source-location-API.patch
View File

@ -1,4 +1,4 @@
From bb79ef26be9066a993bc21a81a53161e75596914 Mon Sep 17 00:00:00 2001 From f98008a45418decdfd9e5431a19b0db37a5c8102 Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co> From: Aikar <aikar@aikar.co>
Date: Sun, 30 Nov 2014 22:57:18 -0600 Date: Sun, 30 Nov 2014 22:57:18 -0600
Subject: [PATCH] Add TNT source location API Subject: [PATCH] Add TNT source location API
@ -98,10 +98,10 @@ index b5763bb..611bac8 100644
public EntityLiving getSource() { public EntityLiving getSource() {
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java 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 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
+++ b/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); throw new IllegalArgumentException("Cannot spawn hanging entity for " + clazz.getName() + " at " + location);
} }
} else if (TNTPrimed.class.isAssignableFrom(clazz)) { } else if (TNTPrimed.class.isAssignableFrom(clazz)) {