From feccc25412ca18b11035fc50bca23273857cdf85 Mon Sep 17 00:00:00 2001 From: Zach Brown Date: Tue, 6 Sep 2016 12:33:47 -0500 Subject: [PATCH] Make collide team removal more patient, safer Fixes GH-414 --- .../0125-Configurable-Player-Collision.patch | 41 ++++++++++--------- ...-possibility-for-getServer-singleton.patch | 8 ++-- .../0148-Optimize-UserCache-Thread-Safe.patch | 8 ++-- 3 files changed, 30 insertions(+), 27 deletions(-) diff --git a/Spigot-Server-Patches/0125-Configurable-Player-Collision.patch b/Spigot-Server-Patches/0125-Configurable-Player-Collision.patch index 222bfe0a3f..6ee67d3058 100644 --- a/Spigot-Server-Patches/0125-Configurable-Player-Collision.patch +++ b/Spigot-Server-Patches/0125-Configurable-Player-Collision.patch @@ -1,4 +1,4 @@ -From df938c2cb1bb037fdddd539367bfb658a79809a1 Mon Sep 17 00:00:00 2001 +From 298ae9e91ce8416d2942e74a935e11b6764c3e84 Mon Sep 17 00:00:00 2001 From: Aikar Date: Wed, 13 Apr 2016 02:10:49 -0400 Subject: [PATCH] Configurable Player Collision @@ -19,7 +19,7 @@ index 17c05f8..d9d8904 100644 + } } diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java -index 8e364de..544d601 100644 +index 8e364de..90cce4a 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java @@ -324,6 +324,13 @@ public abstract class MinecraftServer implements Runnable, ICommandListener, IAs @@ -36,19 +36,6 @@ index 8e364de..544d601 100644 } protected void l() { -@@ -444,6 +451,12 @@ public abstract class MinecraftServer implements Runnable, ICommandListener, IAs - hasStopped = true; - } - // CraftBukkit end -+ // Paper start - Remove collideRule team if it exists -+ if (this.getPlayerList().collideRuleTeamName != null) { -+ ScoreboardTeam team = this.getWorld().getScoreboard().getTeam(this.getPlayerList().collideRuleTeamName); -+ this.getWorld().scoreboard.removeTeam(team); -+ } -+ // Paper end - MinecraftServer.LOGGER.info("Stopping server"); - MinecraftTimings.stopServer(); // Paper - // CraftBukkit start diff --git a/src/main/java/net/minecraft/server/PacketPlayOutScoreboardTeam.java b/src/main/java/net/minecraft/server/PacketPlayOutScoreboardTeam.java index d8ec504..eb45d3c 100644 --- a/src/main/java/net/minecraft/server/PacketPlayOutScoreboardTeam.java @@ -63,7 +50,7 @@ index d8ec504..eb45d3c 100644 } diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java -index a41bc5f..606f022 100644 +index a41bc5f..6dc0abb 100644 --- a/src/main/java/net/minecraft/server/PlayerList.java +++ b/src/main/java/net/minecraft/server/PlayerList.java @@ -67,6 +67,7 @@ public abstract class PlayerList { @@ -86,20 +73,36 @@ index a41bc5f..606f022 100644 // CraftBukkit - Moved from above, added world PlayerList.f.info(entityplayer.getName() + "[" + s1 + "] logged in with entity id " + entityplayer.getId() + " at ([" + entityplayer.world.worldData.getName() + "]" + entityplayer.locX + ", " + entityplayer.locY + ", " + entityplayer.locZ + ")"); } -@@ -404,6 +410,13 @@ public abstract class PlayerList { +@@ -404,6 +410,14 @@ public abstract class PlayerList { entityplayer.k_();// SPIGOT-924 // PAIL: rename - playerTick // CraftBukkit end + // Paper start - Remove from collideRule team if needed + if (this.collideRuleTeamName != null) { + Scoreboard scoreBoard = this.server.getWorld().getScoreboard(); -+ scoreBoard.removePlayerFromTeam(entityplayer.getName(), scoreBoard.getTeam(collideRuleTeamName)); ++ ScoreboardTeam team = scoreBoard.getTeam(this.collideRuleTeamName); ++ if (team != null) scoreBoard.removePlayerFromTeam(entityplayer.getName(), team); + } + // Paper end + this.savePlayerFile(entityplayer); if (entityplayer.isPassenger()) { Entity entity = entityplayer.getVehicle(); +@@ -1302,7 +1316,13 @@ public abstract class PlayerList { + player.playerConnection.disconnect(this.server.server.getShutdownMessage()); // CraftBukkit - add custom shutdown message + } + // CraftBukkit end +- ++ // Paper start - Remove collideRule team if it exists ++ if (this.collideRuleTeamName != null) { ++ Scoreboard scoreboard = this.getServer().getWorld().getScoreboard(); ++ ScoreboardTeam team = scoreboard.getTeam(this.collideRuleTeamName); ++ if (team != null) scoreboard.removeTeam(team); ++ } ++ // Paper end + } + + // CraftBukkit start -- -2.10.0.windows.1 +2.9.3 diff --git a/Spigot-Server-Patches/0138-remove-null-possibility-for-getServer-singleton.patch b/Spigot-Server-Patches/0138-remove-null-possibility-for-getServer-singleton.patch index f963f682e6..14b13519e0 100644 --- a/Spigot-Server-Patches/0138-remove-null-possibility-for-getServer-singleton.patch +++ b/Spigot-Server-Patches/0138-remove-null-possibility-for-getServer-singleton.patch @@ -1,4 +1,4 @@ -From 4acc11dbab4d03e506392d6457501c23d5c11b81 Mon Sep 17 00:00:00 2001 +From 87108169b3fd2c3f92b9367a43d6a66dabbedf95 Mon Sep 17 00:00:00 2001 From: Aikar Date: Thu, 28 Apr 2016 00:57:27 -0400 Subject: [PATCH] remove null possibility for getServer singleton @@ -6,7 +6,7 @@ Subject: [PATCH] remove null possibility for getServer singleton to stop IDE complaining about potential NPE diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java -index 544d601..4f7269b 100644 +index 90cce4a..25c4f9f 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java @@ -49,6 +49,7 @@ import co.aikar.timings.MinecraftTimings; // Paper @@ -25,7 +25,7 @@ index 544d601..4f7269b 100644 io.netty.util.ResourceLeakDetector.setEnabled( false ); // Spigot - disable this.e = proxy; this.U = yggdrasilauthenticationservice; -@@ -1610,7 +1612,7 @@ public abstract class MinecraftServer implements Runnable, ICommandListener, IAs +@@ -1604,7 +1606,7 @@ public abstract class MinecraftServer implements Runnable, ICommandListener, IAs // CraftBukkit start @Deprecated public static MinecraftServer getServer() { @@ -35,5 +35,5 @@ index 544d601..4f7269b 100644 // CraftBukkit end } -- -2.10.0.windows.1 +2.9.3 diff --git a/Spigot-Server-Patches/0148-Optimize-UserCache-Thread-Safe.patch b/Spigot-Server-Patches/0148-Optimize-UserCache-Thread-Safe.patch index e8b0d9c1ad..eb3602f5d6 100644 --- a/Spigot-Server-Patches/0148-Optimize-UserCache-Thread-Safe.patch +++ b/Spigot-Server-Patches/0148-Optimize-UserCache-Thread-Safe.patch @@ -1,4 +1,4 @@ -From a6f002341c7de438b7205c77af63fe64c0145e55 Mon Sep 17 00:00:00 2001 +From f69529e8ae915db7197f5cbc39f551cbbfe4c936 Mon Sep 17 00:00:00 2001 From: Aikar Date: Mon, 16 May 2016 20:47:41 -0400 Subject: [PATCH] Optimize UserCache / Thread Safe @@ -10,10 +10,10 @@ Additionally, move Saving of the User cache to be done async, incase the user never changed the default setting for Spigot's save on stop only. diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java -index 4f7269b..04da697 100644 +index 25c4f9f..005a27b 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java -@@ -513,7 +513,7 @@ public abstract class MinecraftServer implements Runnable, ICommandListener, IAs +@@ -507,7 +507,7 @@ public abstract class MinecraftServer implements Runnable, ICommandListener, IAs // Spigot start if (org.spigotmc.SpigotConfig.saveUserCacheOnStopOnly) { LOGGER.info("Saving usercache.json"); @@ -96,5 +96,5 @@ index ccfc755..989758c 100644 } -- -2.10.0.windows.1 +2.9.3