SteamWar/Paper-Old
Archiviert
13
0
Fork 0
Code Issues Pull-Requests Projekte Releases Wiki Aktivität

Rebuild patches for upstream changes

Quellcode durchsuchen
Dieser Commit ist enthalten in:
Zach Brown 2014-12-12 22:52:49 -06:00
Ursprung 74110558b2
Commit b532dbb6ce
6 geänderte Dateien mit 31 neuen und 31 gelöschten Zeilen
Statistiken anzeigen Patch-Datei herunterladen Vergleichs-Datei herunterladen Alle Dateien ausklappen Alle Dateien einklappen

8
Spigot-Server-Patches/0001-POM-changes.patch
Datei anzeigen

@ -1,11 +1,11 @@
From 5068a5667ecaf1150afc13415600636945d7bfbd Mon Sep 17 00:00:00 2001
From 93cd9e19c9d5e34307b2d64ad5a223f237f78d02 Mon Sep 17 00:00:00 2001
From: Zach Brown <Zbob750@live.com>
Date: Fri, 5 Dec 2014 22:04:50 -0600
Subject: [PATCH] POM changes
diff --git a/pom.xml b/pom.xml
index 74efc8b..31a9b5e 100644
index 4e6f620..f2a404c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,12 +1,12 @@
@ -47,7 +47,7 @@ index 74efc8b..31a9b5e 100644
<version>${project.version}</version>
<type>jar</type>
<scope>compile</scope>
@@ -152,12 +152,12 @@
@@ -144,12 +144,12 @@
</configuration>
<executions>
<execution>
@ -63,7 +63,7 @@ index 74efc8b..31a9b5e 100644
</configuration>
<phase>compile</phase>
<goals>
@@ -188,7 +188,7 @@
@@ -180,7 +180,7 @@
<manifestEntries>
<Main-Class>org.bukkit.craftbukkit.Main</Main-Class>
<Implementation-Title>CraftBukkit</Implementation-Title>

10
Spigot-Server-Patches/0002-PaperSpigot-config-files.patch
Datei anzeigen

@ -1,4 +1,4 @@
From c8f410d89fe8e4a4d7cf179e40be0307bd857f5d Mon Sep 17 00:00:00 2001
From 31e1d6fe29226c10c393683abfa5199324039750 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
@ -20,7 +20,7 @@ index 2806f1e..2e38fec 100644
DedicatedServer.LOGGER.info("Generating keypair");
this.a(MinecraftEncryption.b());
diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
index b6221c6..7a41398 100644
index 9bcbba6..9cf1463 100644
--- a/src/main/java/net/minecraft/server/World.java
+++ b/src/main/java/net/minecraft/server/World.java
@@ -192,6 +192,8 @@ public abstract class World implements IBlockAccess {
@ -41,10 +41,10 @@ index b6221c6..7a41398 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 57bd4f1..a9e23ac 100644
index 8b4b580..aff1c32 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -688,6 +688,7 @@ public final class CraftServer implements Server {
@@ -690,6 +690,7 @@ public final class CraftServer implements Server {
}
org.spigotmc.SpigotConfig.init(); // Spigot
@ -52,7 +52,7 @@ index 57bd4f1..a9e23ac 100644
for (WorldServer world : console.worlds) {
world.worldData.setDifficulty(difficulty);
world.setSpawnFlags(monsters, animals);
@@ -703,12 +704,14 @@ public final class CraftServer implements Server {
@@ -705,12 +706,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
Datei anzeigen

@ -1,11 +1,11 @@
From 0ff7d12c683b2c551d370785246277f7d94f330b Mon Sep 17 00:00:00 2001
From 568169913642077e4003bc41e863ff565cfafed7 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
diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
index bae8ec9..7f65a76 100644
index 2cca633..dcbc6b5 100644
--- a/src/main/java/net/minecraft/server/Entity.java
+++ b/src/main/java/net/minecraft/server/Entity.java
@@ -40,6 +40,13 @@ public abstract class Entity implements ICommandListener {
@ -22,7 +22,7 @@ index bae8ec9..7f65a76 100644
private static final AxisAlignedBB a = new AxisAlignedBB(0.0D, 0.0D, 0.0D, 0.0D, 0.0D, 0.0D);
private static int entityCount;
@@ -1947,7 +1954,7 @@ public abstract class Entity implements ICommandListener {
@@ -1948,7 +1955,7 @@ public abstract class Entity implements ICommandListener {
// minecraftserver.getPlayerList().changeWorld(this, j, worldserver, worldserver1);
boolean before = worldserver1.chunkProviderServer.forceChunkLoad;
worldserver1.chunkProviderServer.forceChunkLoad = true;
@ -31,7 +31,7 @@ index bae8ec9..7f65a76 100644
worldserver1.chunkProviderServer.forceChunkLoad = before;
// CraftBukkit end
this.world.methodProfiler.c("reloading");
@@ -1955,6 +1962,10 @@ public abstract class Entity implements ICommandListener {
@@ -1956,6 +1963,10 @@ public abstract class Entity implements ICommandListener {
if (entity != null) {
entity.n(this);

8
Spigot-Server-Patches/0013-Do-not-remove-player-in-world-change.patch
Datei anzeigen

@ -1,14 +1,14 @@
From 1b65e810cf986d2288d9a0305bc1a4df1ab584b9 Mon Sep 17 00:00:00 2001
From f6381508cca1054a8c6714829d2c4a2a4e08a3c8 Mon Sep 17 00:00:00 2001
From: T00thpick1 <t00thpick1dirko@gmail.com>
Date: Fri, 28 Nov 2014 01:25:45 -0600
Subject: [PATCH] Do not remove player in world change
diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java
index 90030fb..d2f2547 100644
index 34ee440..383b113 100644
--- a/src/main/java/net/minecraft/server/PlayerList.java
+++ b/src/main/java/net/minecraft/server/PlayerList.java
@@ -464,7 +464,7 @@ public abstract class PlayerList {
@@ -465,7 +465,7 @@ public abstract class PlayerList {
entityplayer.u().getTracker().untrackPlayer(entityplayer);
// entityplayer.u().getTracker().untrackEntity(entityplayer); // CraftBukkit
entityplayer.u().getPlayerChunkMap().removePlayer(entityplayer);
@ -17,7 +17,7 @@ index 90030fb..d2f2547 100644
this.server.getWorldServer(entityplayer.dimension).removeEntity(entityplayer);
BlockPosition blockposition = entityplayer.getBed();
boolean flag1 = entityplayer.isRespawnForced();
@@ -558,7 +558,7 @@ public abstract class PlayerList {
@@ -559,7 +559,7 @@ public abstract class PlayerList {
if (!entityplayer.playerConnection.isDisconnected()) {
worldserver.getPlayerChunkMap().addPlayer(entityplayer1);
worldserver.addEntity(entityplayer1);

6
Spigot-Server-Patches/0033-Further-improve-server-tick-loop.patch
Datei anzeigen

@ -1,4 +1,4 @@
From 9fe35c0ebea691395dbbb7d4fad86a374f989fba Mon Sep 17 00:00:00 2001
From 7c272b50a1598705570e5b912cf77b4f3ca36da6 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 a9e23ac..590fe28 100644
index aff1c32..77130ba 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -1683,6 +1683,17 @@ public final class CraftServer implements Server {
@@ -1687,6 +1687,17 @@ public final class CraftServer implements Server {
private final Spigot spigot = new Spigot()
{

22
Spigot-Server-Patches/0036-Player-lookup-improvements.patch
Datei anzeigen

@ -1,4 +1,4 @@
From a63a30097cb93decbd8735d557a4d32ece9c2451 Mon Sep 17 00:00:00 2001
From 636dd83d8c23533c9d27e7a9c1c78486c1e35636 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,10 +13,10 @@ 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 9664482..a92a369 100644
index 383b113..f87d6cf 100644
--- a/src/main/java/net/minecraft/server/PlayerList.java
+++ b/src/main/java/net/minecraft/server/PlayerList.java
@@ -48,6 +48,31 @@ public abstract class PlayerList {
@@ -49,6 +49,31 @@ public abstract class PlayerList {
private static final SimpleDateFormat i = new SimpleDateFormat("yyyy-MM-dd \'at\' HH:mm:ss z");
private final MinecraftServer server;
public final List players = new java.util.concurrent.CopyOnWriteArrayList(); // CraftBukkit - ArrayList -> CopyOnWriteArrayList: Iterator safety
@ -48,7 +48,7 @@ index 9664482..a92a369 100644
public final Map f = Maps.newHashMap();
private final GameProfileBanList k;
private final IpBanList l;
@@ -253,6 +278,7 @@ public abstract class PlayerList {
@@ -254,6 +279,7 @@ public abstract class PlayerList {
public void onPlayerJoin(EntityPlayer entityplayer) {
this.players.add(entityplayer);
@ -56,7 +56,7 @@ index 9664482..a92a369 100644
this.f.put(entityplayer.getUniqueID(), entityplayer);
// this.sendAll(new PacketPlayOutPlayerInfo(EnumPlayerInfoAction.ADD_PLAYER, new EntityPlayer[] { entityplayer})); // CraftBukkit - replaced with loop below
WorldServer worldserver = this.server.getWorldServer(entityplayer.dimension);
@@ -324,6 +350,7 @@ public abstract class PlayerList {
@@ -325,6 +351,7 @@ public abstract class PlayerList {
worldserver.kill(entityplayer);
worldserver.getPlayerChunkMap().removePlayer(entityplayer);
this.players.remove(entityplayer);
@ -64,7 +64,7 @@ index 9664482..a92a369 100644
this.f.remove(entityplayer.getUniqueID());
this.o.remove(entityplayer.getUniqueID());
// CraftBukkit start
@@ -355,6 +382,8 @@ public abstract class PlayerList {
@@ -356,6 +383,8 @@ public abstract class PlayerList {
EntityPlayer entityplayer;
@ -73,7 +73,7 @@ index 9664482..a92a369 100644
for (int i = 0; i < this.players.size(); ++i) {
entityplayer = (EntityPlayer) this.players.get(i);
if (entityplayer.getUniqueID().equals(uuid)) {
@@ -366,6 +395,8 @@ public abstract class PlayerList {
@@ -367,6 +396,8 @@ public abstract class PlayerList {
while (iterator.hasNext()) {
entityplayer = (EntityPlayer) iterator.next();
@ -82,7 +82,7 @@ index 9664482..a92a369 100644
savePlayerFile(entityplayer); // CraftBukkit - Force the player's inventory to be saved
entityplayer.playerConnection.disconnect("You logged in from another location");
}
@@ -957,6 +988,7 @@ public abstract class PlayerList {
@@ -958,6 +989,7 @@ public abstract class PlayerList {
}
public EntityPlayer getPlayer(String s) {
@ -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 590fe28..54e595d 100644
index 77130ba..85a0ddb 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -397,7 +397,12 @@ public final class CraftServer implements Server {
@@ -399,7 +399,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 590fe28..54e595d 100644
String lowerName = name.toLowerCase();
int delta = Integer.MAX_VALUE;
for (Player player : getOnlinePlayers()) {
@@ -418,15 +423,10 @@ public final class CraftServer implements Server {
@@ -420,15 +425,10 @@ public final class CraftServer implements Server {
public Player getPlayerExact(String name) {
Validate.notNull(name, "Name cannot be null");