From fad15a6acce48a6e30c47af6f5fc6db3620ef724 Mon Sep 17 00:00:00 2001 From: Shane Freeder Date: Sat, 31 Mar 2018 10:34:25 +0100 Subject: [PATCH] Update CB/S --- Spigot-Server-Patches/0006-Timings-v2.patch | 32 +++++++++---------- .../0110-Configurable-Player-Collision.patch | 8 ++--- .../0153-Auto-Save-Improvements.patch | 10 +++--- .../0160-Add-EntityZapEvent.patch | 10 +++--- ...figurable-Cartographer-Treasure-Maps.patch | 8 ++--- .../0190-Enforce-Sync-Player-Saves.patch | 10 +++--- ...PI-for-Reason-Source-Triggering-play.patch | 10 +++--- ...le-async-calls-to-restart-the-server.patch | 10 +++--- .../0225-ProfileWhitelistVerifyEvent.patch | 8 ++--- .../0275-Improved-Async-Task-Scheduler.patch | 18 +++++------ ...e-legacy-ping-handler-more-reliable.patch} | 4 +-- ...erverListPingEvent-for-legacy-pings.patch} | 4 +-- work/CraftBukkit | 2 +- work/Spigot | 2 +- 14 files changed, 68 insertions(+), 68 deletions(-) rename Spigot-Server-Patches/{0282-Make-the-legacy-ping-handler-more-reliable.patch => 0283-Make-the-legacy-ping-handler-more-reliable.patch} (98%) rename Spigot-Server-Patches/{0283-Call-PaperServerListPingEvent-for-legacy-pings.patch => 0284-Call-PaperServerListPingEvent-for-legacy-pings.patch} (99%) diff --git a/Spigot-Server-Patches/0006-Timings-v2.patch b/Spigot-Server-Patches/0006-Timings-v2.patch index 303614fc5..1544fe343 100644 --- a/Spigot-Server-Patches/0006-Timings-v2.patch +++ b/Spigot-Server-Patches/0006-Timings-v2.patch @@ -1,4 +1,4 @@ -From e401c3871d43c9580bbff0f5846e19229df0d656 Mon Sep 17 00:00:00 2001 +From 239eb9b8cab46eba22e4c5cbcbde324cf6dc8d25 Mon Sep 17 00:00:00 2001 From: Aikar Date: Thu, 3 Mar 2016 04:00:11 -0600 Subject: [PATCH] Timings v2 @@ -1062,7 +1062,7 @@ index f74b06794..1fc632e0c 100644 + // Paper end } diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java -index 6d27860cd..0fc37a095 100644 +index d4acbed0c..1d9f3e3dd 100644 --- a/src/main/java/net/minecraft/server/PlayerList.java +++ b/src/main/java/net/minecraft/server/PlayerList.java @@ -1,5 +1,6 @@ @@ -1072,7 +1072,7 @@ index 6d27860cd..0fc37a095 100644 import com.google.common.collect.Lists; import com.google.common.collect.Maps; import com.google.common.collect.Sets; -@@ -1209,10 +1210,11 @@ public abstract class PlayerList { +@@ -1212,10 +1213,11 @@ public abstract class PlayerList { } public void savePlayers() { @@ -1674,7 +1674,7 @@ index 2d5dc2179..916781403 100644 public Player.Spigot spigot() diff --git a/src/main/java/org/bukkit/craftbukkit/scheduler/CraftScheduler.java b/src/main/java/org/bukkit/craftbukkit/scheduler/CraftScheduler.java -index 23d7ce26f..d50bbd2a6 100644 +index 71ee1fdd5..e149dbf62 100644 --- a/src/main/java/org/bukkit/craftbukkit/scheduler/CraftScheduler.java +++ b/src/main/java/org/bukkit/craftbukkit/scheduler/CraftScheduler.java @@ -14,6 +14,7 @@ import java.util.concurrent.atomic.AtomicInteger; @@ -1691,7 +1691,7 @@ index 23d7ce26f..d50bbd2a6 100644 return false; - }}); + }}){{this.timings=co.aikar.timings.MinecraftTimings.getCancelTasksTimer();}}; // Paper - handle(task, 0l); + handle(task, 0L); for (CraftTask taskPending = head.getNext(); taskPending != null; taskPending = taskPending.getNext()) { if (taskPending == task) { @@ -222,7 +223,7 @@ public class CraftScheduler implements BukkitScheduler { @@ -1700,7 +1700,7 @@ index 23d7ce26f..d50bbd2a6 100644 } - }); + }){{this.timings=co.aikar.timings.MinecraftTimings.getCancelTasksTimer(plugin);}}; // Paper - handle(task, 0l); + handle(task, 0L); for (CraftTask taskPending = head.getNext(); taskPending != null; taskPending = taskPending.getNext()) { if (taskPending == task) { @@ -254,7 +255,7 @@ public class CraftScheduler implements BukkitScheduler { @@ -1709,7 +1709,7 @@ index 23d7ce26f..d50bbd2a6 100644 } - }); + }){{this.timings=co.aikar.timings.MinecraftTimings.getCancelTasksTimer();}}; // Paper - handle(task, 0l); + handle(task, 0L); for (CraftTask taskPending = head.getNext(); taskPending != null; taskPending = taskPending.getNext()) { if (taskPending == task) { @@ -349,9 +350,7 @@ public class CraftScheduler implements BukkitScheduler { @@ -1750,7 +1750,7 @@ index 23d7ce26f..d50bbd2a6 100644 private boolean isReady(final int currentTick) { diff --git a/src/main/java/org/bukkit/craftbukkit/scheduler/CraftTask.java b/src/main/java/org/bukkit/craftbukkit/scheduler/CraftTask.java -index c37275f2a..a03f933af 100644 +index 7e7ce9a81..46029ce24 100644 --- a/src/main/java/org/bukkit/craftbukkit/scheduler/CraftTask.java +++ b/src/main/java/org/bukkit/craftbukkit/scheduler/CraftTask.java @@ -1,8 +1,8 @@ @@ -1764,7 +1764,7 @@ index c37275f2a..a03f933af 100644 import org.bukkit.plugin.Plugin; import org.bukkit.scheduler.BukkitTask; -@@ -20,11 +20,11 @@ public class CraftTask implements BukkitTask, Runnable { // Spigot +@@ -25,11 +25,11 @@ public class CraftTask implements BukkitTask, Runnable { // Spigot */ private volatile long period; private long nextRun; @@ -1776,10 +1776,10 @@ index c37275f2a..a03f933af 100644 - final CustomTimingsHandler timings; // Spigot CraftTask() { - this(null, null, -1, -1); + this(null, null, CraftTask.NO_REPEATING, CraftTask.NO_REPEATING); } -@@ -33,26 +33,12 @@ public class CraftTask implements BukkitTask, Runnable { // Spigot - this(null, task, -1, -1); +@@ -38,26 +38,12 @@ public class CraftTask implements BukkitTask, Runnable { // Spigot + this(null, task, CraftTask.NO_REPEATING, CraftTask.NO_REPEATING); } - // Spigot start @@ -1807,7 +1807,7 @@ index c37275f2a..a03f933af 100644 } public final int getTaskId() { -@@ -68,7 +54,9 @@ public class CraftTask implements BukkitTask, Runnable { // Spigot +@@ -73,7 +59,9 @@ public class CraftTask implements BukkitTask, Runnable { // Spigot } public void run() { @@ -1817,8 +1817,8 @@ index c37275f2a..a03f933af 100644 } long getPeriod() { -@@ -117,13 +105,4 @@ public class CraftTask implements BukkitTask, Runnable { // Spigot - setPeriod(-2l); +@@ -122,13 +110,4 @@ public class CraftTask implements BukkitTask, Runnable { // Spigot + setPeriod(CraftTask.CANCEL); return true; } - @@ -1906,5 +1906,5 @@ index 2bd690fdf..38be7ed71 100644 } } -- -2.16.2 +2.16.3 diff --git a/Spigot-Server-Patches/0110-Configurable-Player-Collision.patch b/Spigot-Server-Patches/0110-Configurable-Player-Collision.patch index 825e41a75..48f263e1f 100644 --- a/Spigot-Server-Patches/0110-Configurable-Player-Collision.patch +++ b/Spigot-Server-Patches/0110-Configurable-Player-Collision.patch @@ -1,4 +1,4 @@ -From ba58b43d346cad8fad3ad291d8f65606f33e1583 Mon Sep 17 00:00:00 2001 +From 5744f20685d11629777842ce23968b85fdb39714 Mon Sep 17 00:00:00 2001 From: Aikar Date: Wed, 13 Apr 2016 02:10:49 -0400 Subject: [PATCH] Configurable Player Collision @@ -75,7 +75,7 @@ index 549d4e89d..df11764e0 100644 } diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java -index 9f678530f..ed5852ef4 100644 +index e589cc827..3fc242e4b 100644 --- a/src/main/java/net/minecraft/server/PlayerList.java +++ b/src/main/java/net/minecraft/server/PlayerList.java @@ -74,6 +74,7 @@ public abstract class PlayerList { @@ -116,7 +116,7 @@ index 9f678530f..ed5852ef4 100644 this.savePlayerFile(entityplayer); if (entityplayer.isPassenger()) { Entity entity = entityplayer.getVehicle(); -@@ -1349,7 +1366,13 @@ public abstract class PlayerList { +@@ -1352,7 +1369,13 @@ public abstract class PlayerList { player.playerConnection.disconnect(this.server.server.getShutdownMessage()); // CraftBukkit - add custom shutdown message } // CraftBukkit end @@ -132,5 +132,5 @@ index 9f678530f..ed5852ef4 100644 // CraftBukkit start -- -2.16.1 +2.16.3 diff --git a/Spigot-Server-Patches/0153-Auto-Save-Improvements.patch b/Spigot-Server-Patches/0153-Auto-Save-Improvements.patch index c8b440cd7..5da5b121c 100644 --- a/Spigot-Server-Patches/0153-Auto-Save-Improvements.patch +++ b/Spigot-Server-Patches/0153-Auto-Save-Improvements.patch @@ -1,4 +1,4 @@ -From 7c51a79d0c5b06020ba93772ff3f3c558e7133b9 Mon Sep 17 00:00:00 2001 +From 6ca235d6dc418bf48a8a8f7d63d3a077bcdd905c Mon Sep 17 00:00:00 2001 From: Aikar Date: Mon, 19 Sep 2016 23:16:39 -0400 Subject: [PATCH] Auto Save Improvements @@ -102,7 +102,7 @@ index 0adfcaa8b..9e8f67ffd 100644 } } diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java -index b937b6d0d..ef081a57f 100644 +index 2391adac7..8b7eb47a2 100644 --- a/src/main/java/net/minecraft/server/EntityPlayer.java +++ b/src/main/java/net/minecraft/server/EntityPlayer.java @@ -32,6 +32,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting { @@ -161,7 +161,7 @@ index ab7933079..5c09c6ff7 100644 this.methodProfiler.a("tallying"); // Spigot start diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java -index ed5852ef4..efea22c92 100644 +index 3fc242e4b..90f6e2e04 100644 --- a/src/main/java/net/minecraft/server/PlayerList.java +++ b/src/main/java/net/minecraft/server/PlayerList.java @@ -343,6 +343,7 @@ public abstract class PlayerList { @@ -172,7 +172,7 @@ index ed5852ef4..efea22c92 100644 this.playerFileData.save(entityplayer); ServerStatisticManager serverstatisticmanager = (ServerStatisticManager) entityplayer.getStatisticManager(); // CraftBukkit -@@ -1242,13 +1243,25 @@ public abstract class PlayerList { +@@ -1245,13 +1246,25 @@ public abstract class PlayerList { } @@ -223,5 +223,5 @@ index f2ddc22dd..8493dccee 100644 timings.worldSaveChunks.startTiming(); // Paper chunkproviderserver.a(flag); -- -2.16.2 +2.16.3 diff --git a/Spigot-Server-Patches/0160-Add-EntityZapEvent.patch b/Spigot-Server-Patches/0160-Add-EntityZapEvent.patch index 2d4f76a0b..c8432ef3e 100644 --- a/Spigot-Server-Patches/0160-Add-EntityZapEvent.patch +++ b/Spigot-Server-Patches/0160-Add-EntityZapEvent.patch @@ -1,4 +1,4 @@ -From 655aba7ed51731aa844e58fe6358c513c2260f92 Mon Sep 17 00:00:00 2001 +From 2967dc3336c3b8b37d046206e7ada28379d36fd2 Mon Sep 17 00:00:00 2001 From: AlphaBlend Date: Sun, 16 Oct 2016 23:19:30 -0700 Subject: [PATCH] Add EntityZapEvent @@ -22,10 +22,10 @@ index 94d011721..fcf99e668 100644 if (CraftEventFactory.callPigZapEvent(this, entitylightning, entitypigzombie).isCancelled()) { return; diff --git a/src/main/java/net/minecraft/server/EntityVillager.java b/src/main/java/net/minecraft/server/EntityVillager.java -index 2795447b5..2c90112bc 100644 +index fd3714e8e..cfc8d986f 100644 --- a/src/main/java/net/minecraft/server/EntityVillager.java +++ b/src/main/java/net/minecraft/server/EntityVillager.java -@@ -630,6 +630,12 @@ public class EntityVillager extends EntityAgeable implements NPC, IMerchant { +@@ -633,6 +633,12 @@ public class EntityVillager extends EntityAgeable implements NPC, IMerchant { if (!this.world.isClientSide && !this.dead) { EntityWitch entitywitch = new EntityWitch(this.world); @@ -38,7 +38,7 @@ index 2795447b5..2c90112bc 100644 entitywitch.setPositionRotation(this.locX, this.locY, this.locZ, this.yaw, this.pitch); entitywitch.prepare(this.world.D(new BlockPosition(entitywitch)), (GroupDataEntity) null); entitywitch.setNoAI(this.isNoAI()); -@@ -638,7 +644,7 @@ public class EntityVillager extends EntityAgeable implements NPC, IMerchant { +@@ -641,7 +647,7 @@ public class EntityVillager extends EntityAgeable implements NPC, IMerchant { entitywitch.setCustomNameVisible(this.getCustomNameVisible()); } @@ -67,5 +67,5 @@ index bc84dd30f..ba7e5d181 100644 HorseJumpEvent event = new HorseJumpEvent((AbstractHorse) horse.getBukkitEntity(), power); horse.getBukkitEntity().getServer().getPluginManager().callEvent(event); -- -2.16.2 +2.16.3 diff --git a/Spigot-Server-Patches/0177-Configurable-Cartographer-Treasure-Maps.patch b/Spigot-Server-Patches/0177-Configurable-Cartographer-Treasure-Maps.patch index 54e08ce15..c42ea6ad4 100644 --- a/Spigot-Server-Patches/0177-Configurable-Cartographer-Treasure-Maps.patch +++ b/Spigot-Server-Patches/0177-Configurable-Cartographer-Treasure-Maps.patch @@ -1,4 +1,4 @@ -From 889bedc0448d24b11920cd3a265ea4e9219337d4 Mon Sep 17 00:00:00 2001 +From 4539973b3d84e85db28da88b41059b9df098e4ae Mon Sep 17 00:00:00 2001 From: Aikar Date: Tue, 20 Dec 2016 15:26:27 -0500 Subject: [PATCH] Configurable Cartographer Treasure Maps @@ -28,10 +28,10 @@ index 513c4b020..631aa6eb9 100644 + } } diff --git a/src/main/java/net/minecraft/server/EntityVillager.java b/src/main/java/net/minecraft/server/EntityVillager.java -index 2c90112bc..22e3e05ac 100644 +index cfc8d986f..d0183457e 100644 --- a/src/main/java/net/minecraft/server/EntityVillager.java +++ b/src/main/java/net/minecraft/server/EntityVillager.java -@@ -775,7 +775,8 @@ public class EntityVillager extends EntityAgeable implements NPC, IMerchant { +@@ -778,7 +778,8 @@ public class EntityVillager extends EntityAgeable implements NPC, IMerchant { public void a(IMerchant imerchant, MerchantRecipeList merchantrecipelist, Random random) { int i = this.a.a(random); World world = imerchant.u_(); @@ -42,5 +42,5 @@ index 2c90112bc..22e3e05ac 100644 if (blockposition != null) { ItemStack itemstack = ItemWorldMap.a(world, (double) blockposition.getX(), (double) blockposition.getZ(), (byte) 2, true, true); -- -2.16.2 +2.16.3 diff --git a/Spigot-Server-Patches/0190-Enforce-Sync-Player-Saves.patch b/Spigot-Server-Patches/0190-Enforce-Sync-Player-Saves.patch index 5c7cb21c7..17469b726 100644 --- a/Spigot-Server-Patches/0190-Enforce-Sync-Player-Saves.patch +++ b/Spigot-Server-Patches/0190-Enforce-Sync-Player-Saves.patch @@ -1,4 +1,4 @@ -From 174bd0c894d7197b386a677450d20b15d1b7d0e5 Mon Sep 17 00:00:00 2001 +From eea42d14eaa0cc5e8b3b4bc3716ccf9197044386 Mon Sep 17 00:00:00 2001 From: Aikar Date: Sat, 7 Jan 2017 15:41:58 -0500 Subject: [PATCH] Enforce Sync Player Saves @@ -7,10 +7,10 @@ Saving players async is extremely dangerous. This will force it to main the same way we handle async chunk loads. diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java -index efea22c92..91136a8d8 100644 +index 90f6e2e04..054483a73 100644 --- a/src/main/java/net/minecraft/server/PlayerList.java +++ b/src/main/java/net/minecraft/server/PlayerList.java -@@ -1249,6 +1249,7 @@ public abstract class PlayerList { +@@ -1252,6 +1252,7 @@ public abstract class PlayerList { } public void savePlayers(Integer interval) { @@ -18,7 +18,7 @@ index efea22c92..91136a8d8 100644 long now = MinecraftServer.currentTick; MinecraftTimings.savePlayers.startTiming(); // Paper int numSaved = 0; // Paper -@@ -1260,6 +1261,7 @@ public abstract class PlayerList { +@@ -1263,6 +1264,7 @@ public abstract class PlayerList { } } MinecraftTimings.savePlayers.stopTiming(); // Paper @@ -27,5 +27,5 @@ index efea22c92..91136a8d8 100644 // Paper end -- -2.16.2 +2.16.3 diff --git a/Spigot-Server-Patches/0195-ExperienceOrbs-API-for-Reason-Source-Triggering-play.patch b/Spigot-Server-Patches/0195-ExperienceOrbs-API-for-Reason-Source-Triggering-play.patch index 31a49b53b..d263bd84f 100644 --- a/Spigot-Server-Patches/0195-ExperienceOrbs-API-for-Reason-Source-Triggering-play.patch +++ b/Spigot-Server-Patches/0195-ExperienceOrbs-API-for-Reason-Source-Triggering-play.patch @@ -1,4 +1,4 @@ -From 3669e2037cee20bec34be974cbf46c9b02702cfd Mon Sep 17 00:00:00 2001 +From 6c5d889c80c777ddf78ec592c7e9cf0fca7126b5 Mon Sep 17 00:00:00 2001 From: Aikar Date: Tue, 19 Dec 2017 16:31:46 -0500 Subject: [PATCH] ExperienceOrbs API for Reason/Source/Triggering player @@ -129,7 +129,7 @@ index 6ac89d1e3..177d8582f 100644 // CraftBukkit end Item item = itemstack.getItem(); diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java -index 3cd37f28d..ab3ab3889 100644 +index 9e864864d..91e8c1d75 100644 --- a/src/main/java/net/minecraft/server/EntityLiving.java +++ b/src/main/java/net/minecraft/server/EntityLiving.java @@ -347,7 +347,8 @@ public abstract class EntityLiving extends Entity { @@ -156,10 +156,10 @@ index 0255986fd..e14f614f5 100644 this.die(); diff --git a/src/main/java/net/minecraft/server/EntityVillager.java b/src/main/java/net/minecraft/server/EntityVillager.java -index 22e3e05ac..cad3465ed 100644 +index d0183457e..812e88e58 100644 --- a/src/main/java/net/minecraft/server/EntityVillager.java +++ b/src/main/java/net/minecraft/server/EntityVillager.java -@@ -429,7 +429,7 @@ public class EntityVillager extends EntityAgeable implements NPC, IMerchant { +@@ -432,7 +432,7 @@ public class EntityVillager extends EntityAgeable implements NPC, IMerchant { } if (merchantrecipe.j()) { @@ -253,5 +253,5 @@ index 3a09cab3d..3302af0e4 100644 public EntityExperienceOrb getHandle() { return (EntityExperienceOrb) entity; -- -2.16.2 +2.16.3 diff --git a/Spigot-Server-Patches/0204-Properly-handle-async-calls-to-restart-the-server.patch b/Spigot-Server-Patches/0204-Properly-handle-async-calls-to-restart-the-server.patch index 2f97ba8c6..d5c2fcc6f 100644 --- a/Spigot-Server-Patches/0204-Properly-handle-async-calls-to-restart-the-server.patch +++ b/Spigot-Server-Patches/0204-Properly-handle-async-calls-to-restart-the-server.patch @@ -1,4 +1,4 @@ -From cad241a6391082af16b0a6472617360477d07168 Mon Sep 17 00:00:00 2001 +From db841e9eb293958d9c9a79807a6e421294cabda1 Mon Sep 17 00:00:00 2001 From: Zach Brown Date: Fri, 12 May 2017 23:34:11 -0500 Subject: [PATCH] Properly handle async calls to restart the server @@ -78,10 +78,10 @@ index 13c6b5ccd..908a5d273 100644 return this.serverThread; } diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java -index 91136a8d8..cc6a209ea 100644 +index 054483a73..fbbb4e73c 100644 --- a/src/main/java/net/minecraft/server/PlayerList.java +++ b/src/main/java/net/minecraft/server/PlayerList.java -@@ -1375,10 +1375,15 @@ public abstract class PlayerList { +@@ -1378,10 +1378,15 @@ public abstract class PlayerList { entityplayer.playerInteractManager.b(world.getWorldData().getGameType()); } @@ -98,7 +98,7 @@ index 91136a8d8..cc6a209ea 100644 } // CraftBukkit end // Paper start - Remove collideRule team if it exists -@@ -1389,6 +1394,7 @@ public abstract class PlayerList { +@@ -1392,6 +1397,7 @@ public abstract class PlayerList { } // Paper end } @@ -306,5 +306,5 @@ index 947c43a5d..f15fd9f37 100644 } } -- -2.16.2 +2.16.3 diff --git a/Spigot-Server-Patches/0225-ProfileWhitelistVerifyEvent.patch b/Spigot-Server-Patches/0225-ProfileWhitelistVerifyEvent.patch index 548a5a128..ae6524500 100644 --- a/Spigot-Server-Patches/0225-ProfileWhitelistVerifyEvent.patch +++ b/Spigot-Server-Patches/0225-ProfileWhitelistVerifyEvent.patch @@ -1,11 +1,11 @@ -From 25e3e3866a671366fe108346b2276de967bd7974 Mon Sep 17 00:00:00 2001 +From 82b87aee30bce50a525a25af11b68edf8725c1cf Mon Sep 17 00:00:00 2001 From: Aikar Date: Mon, 3 Jul 2017 18:11:10 -0500 Subject: [PATCH] ProfileWhitelistVerifyEvent diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java -index 563b0fb12..d28838627 100644 +index 15af94b3f..1c0c1bd81 100644 --- a/src/main/java/net/minecraft/server/PlayerList.java +++ b/src/main/java/net/minecraft/server/PlayerList.java @@ -542,9 +542,9 @@ public abstract class PlayerList { @@ -20,7 +20,7 @@ index 563b0fb12..d28838627 100644 } else if (getIPBans().isBanned(socketaddress) && !getIPBans().get(socketaddress).hasExpired()) { IpBanEntry ipbanentry = this.l.get(socketaddress); -@@ -1206,9 +1206,25 @@ public abstract class PlayerList { +@@ -1209,9 +1209,25 @@ public abstract class PlayerList { } @@ -48,5 +48,5 @@ index 563b0fb12..d28838627 100644 public boolean isOp(GameProfile gameprofile) { return this.operators.d(gameprofile) || this.server.R() && this.server.worlds.get(0).getWorldData().u() && this.server.Q().equalsIgnoreCase(gameprofile.getName()) || this.u; // CraftBukkit -- -2.16.2 +2.16.3 diff --git a/Spigot-Server-Patches/0275-Improved-Async-Task-Scheduler.patch b/Spigot-Server-Patches/0275-Improved-Async-Task-Scheduler.patch index 3ed1fed72..bfe57b01f 100644 --- a/Spigot-Server-Patches/0275-Improved-Async-Task-Scheduler.patch +++ b/Spigot-Server-Patches/0275-Improved-Async-Task-Scheduler.patch @@ -1,4 +1,4 @@ -From fd92bac5153091c31ee10a80e33658a7df7ba50f Mon Sep 17 00:00:00 2001 +From 319def15cb52ba90e5799dddf8c00714bbf98b16 Mon Sep 17 00:00:00 2001 From: Aikar Date: Fri, 16 Mar 2018 22:59:43 -0400 Subject: [PATCH] Improved Async Task Scheduler @@ -32,7 +32,7 @@ operations are decoupled from the sync tasks queue. diff --git a/src/main/java/org/bukkit/craftbukkit/scheduler/CraftAsyncScheduler.java b/src/main/java/org/bukkit/craftbukkit/scheduler/CraftAsyncScheduler.java new file mode 100644 -index 000000000..061c0ac52 +index 000000000..eaf869287 --- /dev/null +++ b/src/main/java/org/bukkit/craftbukkit/scheduler/CraftAsyncScheduler.java @@ -0,0 +1,127 @@ @@ -160,11 +160,11 @@ index 000000000..061c0ac52 + * @return + */ + static boolean isValid(CraftTask runningTask) { -+ return runningTask.getPeriod() >= -1L; ++ return runningTask.getPeriod() >= CraftTask.NO_REPEATING; + } +} diff --git a/src/main/java/org/bukkit/craftbukkit/scheduler/CraftScheduler.java b/src/main/java/org/bukkit/craftbukkit/scheduler/CraftScheduler.java -index e47f4cca2..ab423392a 100644 +index cc4a256c2..5d0d26e1a 100644 --- a/src/main/java/org/bukkit/craftbukkit/scheduler/CraftScheduler.java +++ b/src/main/java/org/bukkit/craftbukkit/scheduler/CraftScheduler.java @@ -15,7 +15,6 @@ import java.util.concurrent.atomic.AtomicReference; @@ -219,11 +219,11 @@ index e47f4cca2..ab423392a 100644 + // Paper end + public int scheduleSyncDelayedTask(final Plugin plugin, final Runnable task) { - return this.scheduleSyncDelayedTask(plugin, task, 0l); + return this.scheduleSyncDelayedTask(plugin, task, 0L); } @@ -154,7 +170,7 @@ public class CraftScheduler implements BukkitScheduler { - } else if (period < -1l) { - period = -1l; + } else if (period < CraftTask.NO_REPEATING) { + period = CraftTask.NO_REPEATING; } - return handle(new CraftAsyncTask(runners, plugin, runnable, nextId(), period), delay); + return handle(new CraftAsyncTask(this.asyncScheduler.runners, plugin, runnable, nextId(), period), delay); // Paper @@ -291,7 +291,7 @@ index e47f4cca2..ab423392a 100644 + // Paper end for (CraftTask task = head.getNext(); task != null; task = task.getNext()) { if (task.getTaskId() == taskId) { - return task.getPeriod() >= -1l; // The task will run + return task.getPeriod() >= CraftTask.NO_REPEATING; // The task will run @@ -296,6 +339,12 @@ public class CraftScheduler implements BukkitScheduler { } @@ -383,5 +383,5 @@ index e47f4cca2..ab423392a 100644 private boolean isReady(final int currentTick) { -- -2.16.2 +2.16.3 diff --git a/Spigot-Server-Patches/0282-Make-the-legacy-ping-handler-more-reliable.patch b/Spigot-Server-Patches/0283-Make-the-legacy-ping-handler-more-reliable.patch similarity index 98% rename from Spigot-Server-Patches/0282-Make-the-legacy-ping-handler-more-reliable.patch rename to Spigot-Server-Patches/0283-Make-the-legacy-ping-handler-more-reliable.patch index 8900585ec..c1aa1a8d1 100644 --- a/Spigot-Server-Patches/0282-Make-the-legacy-ping-handler-more-reliable.patch +++ b/Spigot-Server-Patches/0283-Make-the-legacy-ping-handler-more-reliable.patch @@ -1,4 +1,4 @@ -From 95527478bf4b3c267b28bf2f82ba0c52185cf9ec Mon Sep 17 00:00:00 2001 +From 8e5a4d422205bd51108889a54cc0232b9c2595ce Mon Sep 17 00:00:00 2001 From: Minecrell Date: Wed, 11 Oct 2017 18:22:50 +0200 Subject: [PATCH] Make the legacy ping handler more reliable @@ -153,5 +153,5 @@ index 4c1a0181a..f084a653a 100644 channelhandlercontext.pipeline().firstContext().writeAndFlush(bytebuf).addListener(ChannelFutureListener.CLOSE); } -- -2.16.2 +2.16.3 diff --git a/Spigot-Server-Patches/0283-Call-PaperServerListPingEvent-for-legacy-pings.patch b/Spigot-Server-Patches/0284-Call-PaperServerListPingEvent-for-legacy-pings.patch similarity index 99% rename from Spigot-Server-Patches/0283-Call-PaperServerListPingEvent-for-legacy-pings.patch rename to Spigot-Server-Patches/0284-Call-PaperServerListPingEvent-for-legacy-pings.patch index f18c64628..257eb106b 100644 --- a/Spigot-Server-Patches/0283-Call-PaperServerListPingEvent-for-legacy-pings.patch +++ b/Spigot-Server-Patches/0284-Call-PaperServerListPingEvent-for-legacy-pings.patch @@ -1,4 +1,4 @@ -From c3962bc906bb2b19cd37ef2d64d3aaa1a06763d3 Mon Sep 17 00:00:00 2001 +From ef980d38e4f0edea3e20cdc1b4bfb27f78a2fe7f Mon Sep 17 00:00:00 2001 From: Minecrell Date: Wed, 11 Oct 2017 19:30:51 +0200 Subject: [PATCH] Call PaperServerListPingEvent for legacy pings @@ -153,5 +153,5 @@ index f084a653a..39d19e91b 100644 } -- -2.15.0 +2.16.3 diff --git a/work/CraftBukkit b/work/CraftBukkit index aa255689c..1daee5391 160000 --- a/work/CraftBukkit +++ b/work/CraftBukkit @@ -1 +1 @@ -Subproject commit aa255689c1e00b77b066440bbfd2d84b641bfd58 +Subproject commit 1daee53916b517727c17fb5cfe06cc3e662b9375 diff --git a/work/Spigot b/work/Spigot index c3093efaf..b6ecf3b31 160000 --- a/work/Spigot +++ b/work/Spigot @@ -1 +1 @@ -Subproject commit c3093efafc5eab1ea62a8a57aa47f28f5ea85d03 +Subproject commit b6ecf3b31636d08e0bac78dd21adc3b0a8ca70ed