CatMC-Network/PaperSpigot-Parent
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Rebuild our patches for upstream changes

Browse Source
This commit is contained in:
Zach Brown 2014-12-14 16:25:11 -06:00
parent 8bbab87c6b
commit 11b53f20cf
10 changed files with 43 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Spigot-API-Patches/0004-Player-affects-spawning-API.patch
View File

@ -1,16 +1,16 @@
From acaa1434ed190e4fcf4773a8f5d9e53d2afbab4e Mon Sep 17 00:00:00 2001
From 0bd64a7783ea2396b482b392e95751e4b13cd3a3 Mon Sep 17 00:00:00 2001
From: Jedediah Smith <jedediah@silencegreys.com>
Date: Fri, 8 Aug 2014 22:51:26 -0500
Subject: [PATCH] Player affects spawning API
diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
index b55d70e..9793aae 100644
index 8eb781e..a6d4020 100644
--- a/src/main/java/org/bukkit/entity/Player.java
+++ b/src/main/java/org/bukkit/entity/Player.java
@@ -1104,6 +1104,28 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline
{
throw new UnsupportedOperationException( "Not supported yet." );
@@ -1122,6 +1122,28 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline
public void sendMessage(net.md_5.bungee.api.chat.BaseComponent... components) {
throw new UnsupportedOperationException("Not supported yet.");
}
+
+ /**

10
Spigot-API-Patches/0005-Add-getTPS-method.patch
View File

@ -1,16 +1,16 @@
From e72ca8f6069f746db006415563451d9f23f2f5fd Mon Sep 17 00:00:00 2001
From 8cc593837dbec7efb008515e7db936e19f488280 Mon Sep 17 00:00:00 2001
From: Zach Brown <Zbob750@live.com>
Date: Sun, 19 Oct 2014 18:22:18 -0500
Subject: [PATCH] Add getTPS method
diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
index 57b2794..fff2843 100644
index cf4ab1d..b7a02cc 100644
--- a/src/main/java/org/bukkit/Server.java
+++ b/src/main/java/org/bukkit/Server.java
@@ -916,6 +916,13 @@ public interface Server extends PluginMessageRecipient {
{
throw new UnsupportedOperationException( "Not supported yet." );
@@ -934,6 +934,13 @@ public interface Server extends PluginMessageRecipient {
public void broadcast(net.md_5.bungee.api.chat.BaseComponent... components) {
throw new UnsupportedOperationException("Not supported yet.");
}
+
+ // PaperSpigot start - Add getTPS method

8
Spigot-Server-Patches/0002-PaperSpigot-config-files.patch
View File

@ -1,4 +1,4 @@
From 31e1d6fe29226c10c393683abfa5199324039750 Mon Sep 17 00:00:00 2001
From 1783d691ec4beeedf0ff8431bc4ad381f82e490d Mon Sep 17 00:00:00 2001
From: Zach Brown <Zbob750@live.com>
Date: Sat, 12 Jul 2014 19:32:01 -0500
Subject: [PATCH] PaperSpigot config files
@ -41,10 +41,10 @@ index 9bcbba6..9cf1463 100644
this.world = new CraftWorld((WorldServer) this, gen, env);
this.ticksPerAnimalSpawns = this.getServer().getTicksPerAnimalSpawns(); // CraftBukkit
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index 8b4b580..aff1c32 100644
index 980dd99..7d7bba4 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -690,6 +690,7 @@ public final class CraftServer implements Server {
@@ -691,6 +691,7 @@ public final class CraftServer implements Server {
}
org.spigotmc.SpigotConfig.init(); // Spigot
@ -52,7 +52,7 @@ index 8b4b580..aff1c32 100644
for (WorldServer world : console.worlds) {
world.worldData.setDifficulty(difficulty);
world.setSpawnFlags(monsters, animals);
@@ -705,12 +706,14 @@ public final class CraftServer implements Server {
@@ -706,12 +707,14 @@ public final class CraftServer implements Server {
world.ticksPerMonsterSpawns = this.getTicksPerMonsterSpawns();
}
world.spigotConfig.init(); // Spigot

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

@ -1,4 +1,4 @@
From 568169913642077e4003bc41e863ff565cfafed7 Mon Sep 17 00:00:00 2001
From b8780a9816233ecf0d111d9ac45042bd32775eaf Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
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 8700b18..c5d8c56 100644
index cb65795..5802707 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -451,7 +451,27 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -452,7 +452,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 8700b18..c5d8c56 100644
// Update the From Location
from = event.getFrom();
@@ -472,6 +492,17 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -473,6 +493,17 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
} else {
server.getHandle().moveToWorld(entity, toWorld.dimension, true, to, true);
}

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

@ -1,11 +1,11 @@
From dde4bca2bceb41f4039c7bc1f1ab2c433a23b07f Mon Sep 17 00:00:00 2001
From 9264fb0fc4074c31618ea8711a47b0ccac364ed1 Mon Sep 17 00:00:00 2001
From: Jedediah Smith <jedediah@silencegreys.com>
Date: Fri, 28 Nov 2014 03:31:21 -0600
Subject: [PATCH] Player affects spawning API
diff --git a/src/main/java/net/minecraft/server/EntityHuman.java b/src/main/java/net/minecraft/server/EntityHuman.java
index acc83d0..998c13a 100644
index 2bc2ef6..0199856 100644
--- a/src/main/java/net/minecraft/server/EntityHuman.java
+++ b/src/main/java/net/minecraft/server/EntityHuman.java
@@ -61,6 +61,7 @@ public abstract class EntityHuman extends EntityLiving {
@ -146,12 +146,12 @@ 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 c5d8c56..f73b6d7 100644
index 5802707..4559d97 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -1458,6 +1458,16 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
return java.util.Collections.unmodifiableSet( ret );
@@ -1473,6 +1473,16 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
packet.components = components;
getHandle().playerConnection.sendPacket(packet);
}
+
+ // PaperSpigot start - Add affects spawning API

6
Spigot-Server-Patches/0033-Further-improve-server-tick-loop.patch
View File

@ -1,4 +1,4 @@
From 7c272b50a1598705570e5b912cf77b4f3ca36da6 Mon Sep 17 00:00:00 2001
From 051e4b770eae14422c24b96f99d83bc033831d6e Mon Sep 17 00:00:00 2001
From: Zach Brown <Zbob750@live.com>
Date: Fri, 28 Nov 2014 12:48:26 -0600
Subject: [PATCH] Further improve server tick loop
@ -150,10 +150,10 @@ index 86b8cb2..3592150 100644
lastTick = curTime;
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index aff1c32..77130ba 100644
index 7d7bba4..5f6f1cf 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -1687,6 +1687,17 @@ public final class CraftServer implements Server {
@@ -1688,6 +1688,17 @@ public final class CraftServer implements Server {
private final Spigot spigot = new Spigot()
{

6
Spigot-Server-Patches/0035-Only-refresh-abilities-if-needed.patch
View File

@ -1,14 +1,14 @@
From ca69d5f4566892c66abcf55ad2a01295ab897312 Mon Sep 17 00:00:00 2001
From c035fcfc6ef7cfa40c1d9dff75a10aeceb785ee4 Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Fri, 28 Nov 2014 13:20:22 -0600
Subject: [PATCH] Only refresh abilities if needed
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
index ab8afd7..a2cda7e 100644
index 4559d97..7358519 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -1175,12 +1175,13 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -1176,12 +1176,13 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@Override
public void setFlying(boolean value) {

14
Spigot-Server-Patches/0036-Player-lookup-improvements.patch
View File

@ -1,4 +1,4 @@
From 636dd83d8c23533c9d27e7a9c1c78486c1e35636 Mon Sep 17 00:00:00 2001
From dd7b5db563cfdbfb9be6651a9309afcf1d8f1cc6 Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Fri, 28 Nov 2014 13:43:11 -0600
Subject: [PATCH] Player lookup improvements
@ -13,7 +13,7 @@ By using a map based approach for player lookups, player lookup should
be consistent in performance regardless of how many players are online.
diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java
index 383b113..f87d6cf 100644
index c4b11c9..cc2cc30 100644
--- a/src/main/java/net/minecraft/server/PlayerList.java
+++ b/src/main/java/net/minecraft/server/PlayerList.java
@@ -49,6 +49,31 @@ public abstract class PlayerList {
@ -114,10 +114,10 @@ index 8be0698..4a908c6 100644
@Override
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index 77130ba..85a0ddb 100644
index 5f6f1cf..f10f41a 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -399,7 +399,12 @@ public final class CraftServer implements Server {
@@ -400,7 +400,12 @@ public final class CraftServer implements Server {
public Player getPlayer(final String name) {
Validate.notNull(name, "Name cannot be null");
@ -131,7 +131,7 @@ index 77130ba..85a0ddb 100644
String lowerName = name.toLowerCase();
int delta = Integer.MAX_VALUE;
for (Player player : getOnlinePlayers()) {
@@ -420,15 +425,10 @@ public final class CraftServer implements Server {
@@ -421,15 +426,10 @@ public final class CraftServer implements Server {
public Player getPlayerExact(String name) {
Validate.notNull(name, "Name cannot be null");
@ -152,10 +152,10 @@ index 77130ba..85a0ddb 100644
@Override
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
index f07a3a8..b1646e5 100644
index 7358519..e9bb266 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -103,13 +103,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -104,13 +104,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
}
public boolean isOnline() {

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

@ -1,14 +1,14 @@
From b3f12462780511ff56a4d5d6b5049bdffc46464e Mon Sep 17 00:00:00 2001
From 50704068d790dafc8d9a67c1569a21f97f329bb5 Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
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 d67ba8f..4b3f828 100644
index e4ee220..562f057 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
@@ -117,6 +117,24 @@ public class CraftWorld implements World {
@@ -119,6 +119,24 @@ public class CraftWorld implements World {
}
}

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

@ -1,4 +1,4 @@
From d209349d290cbd554d7dcab9c90f1aff5d0c7310 Mon Sep 17 00:00:00 2001
From 7aa294e6e9b3972f9a0c84522312ca3944eb0a9f Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
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 0804eb6..29f743f 100644
index 562f057..405920a 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
@@ -1075,7 +1075,8 @@ public class CraftWorld implements World {
@@ -1063,7 +1063,8 @@ public class CraftWorld implements World {
throw new IllegalArgumentException("Cannot spawn hanging entity for " + clazz.getName() + " at " + location);
}
} else if (TNTPrimed.class.isAssignableFrom(clazz)) {