From bc024aec6e648ce3ca45d3fc487c0f408b6040e1 Mon Sep 17 00:00:00 2001 From: Spottedleaf Date: Mon, 6 May 2019 17:33:26 -0700 Subject: [PATCH] Update upstream --- Spigot-Server-Patches/0009-Timings-v2.patch | 16 ++++++++-------- ...-client-crashes-server-lists-and-Mojang.patch | 6 +++--- .../0021-Further-improve-server-tick-loop.patch | 10 +++++----- .../0030-Optimize-explosions.patch | 8 ++++---- ...BlockPhysicsEvent-if-a-plugin-has-a-lis.patch | 6 +++--- .../0091-Configurable-Player-Collision.patch | 12 ++++++------ ...ull-possibility-for-getServer-singleton.patch | 6 +++--- .../0103-Optimize-UserCache-Thread-Safe.patch | 6 +++--- ...ragon-Wither-Death-sounds-to-same-world.patch | 8 ++++---- ...s-API-for-Reason-Source-Triggering-play.patch | 6 +++--- ...andle-async-calls-to-restart-the-server.patch | 10 +++++----- ...onsoleAppender-for-console-improvements.patch | 10 +++++----- .../0160-Basic-PlayerProfile-API.patch | 8 ++++---- ...ement-extended-PaperServerListPingEvent.patch | 6 +++--- .../0278-Add-TNTPrimeEvent.patch | 6 +++--- ...3-Add-Early-Warning-Feature-to-WatchDog.patch | 14 +++++++------- .../0293-Optimize-Hoppers.patch | 6 +++--- .../0315-Optimize-Server-World-Map.patch | 8 ++++---- .../0341-Optimize-World-Time-Updates.patch | 6 +++--- .../0379-Server-Tick-Events.patch | 8 ++++---- ...vents-to-fire-only-after-the-server-plu.patch | 6 +++--- ...r-Player-View-Distance-API-placeholders.patch | 6 +++--- work/CraftBukkit | 2 +- 23 files changed, 90 insertions(+), 90 deletions(-) diff --git a/Spigot-Server-Patches/0009-Timings-v2.patch b/Spigot-Server-Patches/0009-Timings-v2.patch index 1763f82ffb..a48132678d 100644 --- a/Spigot-Server-Patches/0009-Timings-v2.patch +++ b/Spigot-Server-Patches/0009-Timings-v2.patch @@ -1,4 +1,4 @@ -From f7f8402e29b9516fedb8a617a5079f0861603d12 Mon Sep 17 00:00:00 2001 +From 94debd73b26dbfff556ce7f3dfc51334b48efeb3 Mon Sep 17 00:00:00 2001 From: Aikar Date: Thu, 3 Mar 2016 04:00:11 -0600 Subject: [PATCH] Timings v2 @@ -634,7 +634,7 @@ index f86e6a4c51..85567a7072 100644 } diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java -index 4de927416b..4c1c914132 100644 +index 472e8e852f..df9098955c 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java @@ -1,5 +1,7 @@ @@ -655,7 +655,7 @@ index 4de927416b..4c1c914132 100644 public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant implements IMojangStatistics, ICommandListener, AutoCloseable, Runnable { -@@ -672,6 +674,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant 0 && this.ticks % autosavePeriod == 0) { // CraftBukkit @@ -687,7 +687,7 @@ index 4de927416b..4c1c914132 100644 } this.methodProfiler.enter("snooper"); -@@ -1000,29 +1001,28 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant Date: Tue, 1 Mar 2016 14:32:43 -0600 Subject: [PATCH] Show 'Paper' in client crashes, server lists, and Mojang @@ -19,10 +19,10 @@ index 3f35a28ba1..cf00f35a5b 100644 throwable = throwable1; throw throwable1; diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java -index 4c1c914132..13a0918cea 100644 +index df9098955c..f071c3c043 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java -@@ -1288,7 +1288,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant Date: Tue, 1 Mar 2016 23:09:29 -0600 Subject: [PATCH] Further improve server tick loop @@ -12,7 +12,7 @@ Previous implementation did not calculate TPS correctly. Switch to a realistic rolling average and factor in std deviation as an extra reporting variable diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java -index 13a0918cea..c53224b11d 100644 +index f071c3c043..1a75db6f49 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java @@ -150,7 +150,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant Date: Wed, 2 Mar 2016 11:59:48 -0600 Subject: [PATCH] Optimize explosions @@ -123,10 +123,10 @@ index e1c628f177..bcff117619 100644 + // Paper end } diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java -index 320af3f503..1a9a981ade 100644 +index 1a75db6f49..fd1b268798 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java -@@ -1141,6 +1141,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant Date: Mon, 28 Mar 2016 19:55:45 -0400 Subject: [PATCH] Only process BlockPhysicsEvent if a plugin has a listener @@ -32,10 +32,10 @@ index 469a3be057..f2c429f22e 100644 } // CraftBukkit end diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java -index 1a9a981ade..f35289e4ff 100644 +index fd1b268798..ff70ef38aa 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java -@@ -1106,6 +1106,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant Date: Wed, 13 Apr 2016 02:10:49 -0400 Subject: [PATCH] Configurable Player Collision diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java -index 4424f7ef1..69bfe6241 100644 +index 4424f7ef18..69bfe62416 100644 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java @@ -223,4 +223,9 @@ public class PaperConfig { @@ -19,10 +19,10 @@ index 4424f7ef1..69bfe6241 100644 + } } diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java -index f35289e4f..e0dde2216 100644 +index ff70ef38aa..860957c0b1 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java -@@ -440,6 +440,20 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant 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 e0dde2216a..e9fad2999d 100644 +index 860957c0b1..a3c53d9dbf 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java @@ -61,6 +61,7 @@ import co.aikar.timings.MinecraftTimings; // Paper @@ -25,7 +25,7 @@ index e0dde2216a..e9fad2999d 100644 this.ae = new ResourceManager(EnumResourcePackType.SERVER_DATA, this.serverThread); this.resourcePackRepository = new ResourcePackRepository<>(ResourcePackLoader::new); this.ai = new CraftingManager(); -@@ -1916,7 +1918,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant 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 e9fad2999d..d7071929b8 100644 +index a3c53d9dbf..3b745b2b75 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java -@@ -740,7 +740,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant Date: Tue, 31 May 2016 22:53:50 -0400 Subject: [PATCH] Only send Dragon/Wither Death sounds to same world @@ -6,10 +6,10 @@ Subject: [PATCH] Only send Dragon/Wither Death sounds to same world Also fix view distance lookup diff --git a/src/main/java/net/minecraft/server/EntityEnderDragon.java b/src/main/java/net/minecraft/server/EntityEnderDragon.java -index 245b1d100..bfdb63094 100644 +index 831a99ebee..2ee80c2863 100644 --- a/src/main/java/net/minecraft/server/EntityEnderDragon.java +++ b/src/main/java/net/minecraft/server/EntityEnderDragon.java -@@ -558,8 +558,11 @@ public class EntityEnderDragon extends EntityInsentient implements IMonster { +@@ -563,8 +563,11 @@ public class EntityEnderDragon extends EntityInsentient implements IMonster { if (this.bL == 1) { // CraftBukkit start - Use relative location for far away sounds // this.world.b(1028, new BlockPosition(this), 0); @@ -24,7 +24,7 @@ index 245b1d100..bfdb63094 100644 double deltaZ = this.locZ - player.locZ; double distanceSquared = deltaX * deltaX + deltaZ * deltaZ; diff --git a/src/main/java/net/minecraft/server/EntityWither.java b/src/main/java/net/minecraft/server/EntityWither.java -index f23f09430..48b22894a 100644 +index f23f094303..48b22894aa 100644 --- a/src/main/java/net/minecraft/server/EntityWither.java +++ b/src/main/java/net/minecraft/server/EntityWither.java @@ -207,8 +207,11 @@ public class EntityWither extends EntityMonster implements IRangedEntity { diff --git a/Spigot-Server-Patches/0145-ExperienceOrbs-API-for-Reason-Source-Triggering-play.patch b/Spigot-Server-Patches/0145-ExperienceOrbs-API-for-Reason-Source-Triggering-play.patch index e28f1bbbff..8a2e1761c0 100644 --- a/Spigot-Server-Patches/0145-ExperienceOrbs-API-for-Reason-Source-Triggering-play.patch +++ b/Spigot-Server-Patches/0145-ExperienceOrbs-API-for-Reason-Source-Triggering-play.patch @@ -1,4 +1,4 @@ -From 20bed4702ddd6ccd81f7105df0bf6d31158555ba Mon Sep 17 00:00:00 2001 +From 4194fadfef71e639deaa66ce9b3d6702384d326c 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 @@ -41,10 +41,10 @@ index 2e4f81ebe4..88b9655bb0 100644 world.triggerEffect(1042, blockposition, 0); diff --git a/src/main/java/net/minecraft/server/EntityEnderDragon.java b/src/main/java/net/minecraft/server/EntityEnderDragon.java -index bfdb63094b..3a6ae654cc 100644 +index 2ee80c2863..b0651a7086 100644 --- a/src/main/java/net/minecraft/server/EntityEnderDragon.java +++ b/src/main/java/net/minecraft/server/EntityEnderDragon.java -@@ -602,7 +602,7 @@ public class EntityEnderDragon extends EntityInsentient implements IMonster { +@@ -607,7 +607,7 @@ public class EntityEnderDragon extends EntityInsentient implements IMonster { int j = EntityExperienceOrb.getOrbValue(i); i -= j; diff --git a/Spigot-Server-Patches/0150-Properly-handle-async-calls-to-restart-the-server.patch b/Spigot-Server-Patches/0150-Properly-handle-async-calls-to-restart-the-server.patch index 034f8c4b41..96a7fb3859 100644 --- a/Spigot-Server-Patches/0150-Properly-handle-async-calls-to-restart-the-server.patch +++ b/Spigot-Server-Patches/0150-Properly-handle-async-calls-to-restart-the-server.patch @@ -1,4 +1,4 @@ -From 33332f35059abad5b341500014eb43e2145912f4 Mon Sep 17 00:00:00 2001 +From e5b162f22e402926b6adbca86c920ca466bcf92d 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 @@ -30,7 +30,7 @@ will have plugins and worlds saving to the disk has a high potential to result in corruption/dataloss. diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java -index d7071929b8..486e45d9df 100644 +index 3b745b2b75..c117e8fa3f 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java @@ -80,6 +80,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant Date: Fri, 9 Jun 2017 19:03:43 +0200 Subject: [PATCH] Use TerminalConsoleAppender for console improvements @@ -185,7 +185,7 @@ index 19e2df3098..3d0cb874d7 100644 System.setOut(new PrintStream(new LoggerOutputStream(logger, Level.INFO), true)); System.setErr(new PrintStream(new LoggerOutputStream(logger, Level.WARN), true)); diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java -index 486e45d9df..ff7491131e 100644 +index c117e8fa3f..ffe81205b8 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java @@ -50,7 +50,7 @@ import org.apache.commons.lang3.Validate; @@ -225,7 +225,7 @@ index 486e45d9df..ff7491131e 100644 Runtime.getRuntime().addShutdownHook(new org.bukkit.craftbukkit.util.ServerShutdownThread(this)); } // CraftBukkit end -@@ -941,7 +945,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant Date: Mon, 15 Jan 2018 22:11:48 -0500 Subject: [PATCH] Basic PlayerProfile API @@ -429,10 +429,10 @@ index d7dc516e4a..d2019fb74c 100644 * Calculates distance between 2 entities * @param e1 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java -index ff7491131e..91eed567cb 100644 +index ffe81205b8..c84af46815 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java -@@ -1256,7 +1256,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant Date: Wed, 11 Oct 2017 15:56:26 +0200 Subject: [PATCH] Implement extended PaperServerListPingEvent @@ -177,7 +177,7 @@ index 0000000000..a85466bc7e + +} diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java -index 91eed567cb..d3620b18a0 100644 +index c84af46815..ffa850077f 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java @@ -1,6 +1,7 @@ @@ -188,7 +188,7 @@ index 91eed567cb..d3620b18a0 100644 import com.google.common.base.Stopwatch; import com.google.common.collect.Lists; import com.google.common.collect.Maps; -@@ -1056,7 +1057,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant= 5000000000L) { this.Z = i; this.serverPing.setPlayerSample(new ServerPing.ServerPingPlayerSample(this.getMaxPlayers(), this.getPlayerCount())); diff --git a/Spigot-Server-Patches/0278-Add-TNTPrimeEvent.patch b/Spigot-Server-Patches/0278-Add-TNTPrimeEvent.patch index e86e0662b4..9a075bdea7 100644 --- a/Spigot-Server-Patches/0278-Add-TNTPrimeEvent.patch +++ b/Spigot-Server-Patches/0278-Add-TNTPrimeEvent.patch @@ -1,4 +1,4 @@ -From 3878afe26abbcbc153c15da6aecda75ae2c436f4 Mon Sep 17 00:00:00 2001 +From 7f43982ceaf4025eb8c116872d604a3c575256c5 Mon Sep 17 00:00:00 2001 From: Mark Vainomaa Date: Mon, 16 Jul 2018 00:05:05 +0300 Subject: [PATCH] Add TNTPrimeEvent @@ -114,7 +114,7 @@ index 8cb36ed3a4..88d0238718 100644 world.a(blockposition, false); } diff --git a/src/main/java/net/minecraft/server/EntityEnderDragon.java b/src/main/java/net/minecraft/server/EntityEnderDragon.java -index 3a6ae654cc..3abf89b741 100644 +index b0651a7086..6d51413d18 100644 --- a/src/main/java/net/minecraft/server/EntityEnderDragon.java +++ b/src/main/java/net/minecraft/server/EntityEnderDragon.java @@ -11,6 +11,7 @@ import org.bukkit.craftbukkit.block.CraftBlock; @@ -125,7 +125,7 @@ index 3a6ae654cc..3abf89b741 100644 // PAIL: Fixme public class EntityEnderDragon extends EntityInsentient implements IMonster { -@@ -458,6 +459,11 @@ public class EntityEnderDragon extends EntityInsentient implements IMonster { +@@ -463,6 +464,11 @@ public class EntityEnderDragon extends EntityInsentient implements IMonster { Block.b(craftBlock.getNMS(), loottableinfo_builder); } diff --git a/Spigot-Server-Patches/0283-Add-Early-Warning-Feature-to-WatchDog.patch b/Spigot-Server-Patches/0283-Add-Early-Warning-Feature-to-WatchDog.patch index 1535902d4a..58ce2ebe89 100644 --- a/Spigot-Server-Patches/0283-Add-Early-Warning-Feature-to-WatchDog.patch +++ b/Spigot-Server-Patches/0283-Add-Early-Warning-Feature-to-WatchDog.patch @@ -1,4 +1,4 @@ -From 441c6e99526e017a629d70d8b155eaeedb938f8e Mon Sep 17 00:00:00 2001 +From d7993a246e5a8d92ca00aa8245c80928374415f5 Mon Sep 17 00:00:00 2001 From: miclebrick Date: Wed, 8 Aug 2018 15:30:52 -0400 Subject: [PATCH] Add Early Warning Feature to WatchDog @@ -9,7 +9,7 @@ thread dumps at an interval until the point of crash. This will help diagnose what was going on in that time before the crash. diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java -index d773ef5b0..833659bbb 100644 +index d773ef5b0d..833659bbb2 100644 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java @@ -25,6 +25,7 @@ import org.bukkit.configuration.file.YamlConfiguration; @@ -36,10 +36,10 @@ index d773ef5b0..833659bbb 100644 public static int tabSpamLimit = 500; private static void tabSpamLimiters() { diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java -index d3620b18a..afa6e6644 100644 +index ffa850077f..45cd31e88a 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java -@@ -848,6 +848,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant Date: Wed, 27 Apr 2016 22:09:52 -0400 Subject: [PATCH] Optimize Hoppers @@ -47,10 +47,10 @@ index ca1bd02995..2d83c9e79c 100644 itemstack.d(this.C()); if (this.tag != null) { diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java -index afa6e6644e..e5d96bf750 100644 +index 45cd31e88a..11551ff9e8 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java -@@ -1136,6 +1136,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant 0; // Paper diff --git a/Spigot-Server-Patches/0315-Optimize-Server-World-Map.patch b/Spigot-Server-Patches/0315-Optimize-Server-World-Map.patch index 5c2af9f4ef..5f28c0f562 100644 --- a/Spigot-Server-Patches/0315-Optimize-Server-World-Map.patch +++ b/Spigot-Server-Patches/0315-Optimize-Server-World-Map.patch @@ -1,4 +1,4 @@ -From aa2876d619e0b783f9821fbcbbf36c6ad968f3ed Mon Sep 17 00:00:00 2001 +From 81bdfc32b19f1476bb80d1f752a531f975115b87 Mon Sep 17 00:00:00 2001 From: Aikar Date: Mon, 17 Sep 2018 23:37:31 -0400 Subject: [PATCH] Optimize Server World Map @@ -217,7 +217,7 @@ index 0000000000..af9e4455c6 + } +} diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java -index f04d0530f5..6c12240292 100644 +index 55c096bc08..04adcbb6b6 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java @@ -78,7 +78,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant Date: Fri, 2 Nov 2018 23:11:51 -0400 Subject: [PATCH] Optimize World Time Updates @@ -8,10 +8,10 @@ the updates per world, so that we can re-use the same packet object for every player unless they have per-player time enabled. diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java -index 6c12240292..e612879495 100644 +index 04adcbb6b6..200bac9c32 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java -@@ -1120,12 +1120,24 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant Date: Wed, 27 Mar 2019 22:48:45 -0400 Subject: [PATCH] Server Tick Events @@ -6,10 +6,10 @@ Subject: [PATCH] Server Tick Events Fires event at start and end of a server tick diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java -index e612879495..3fc232431a 100644 +index 200bac9c32..f8ec6a5184 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java -@@ -1051,6 +1051,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant Date: Sun, 31 Mar 2019 22:02:24 -0700 Subject: [PATCH] Allow login events to fire only after the server plugins are @@ -56,10 +56,10 @@ index 9e4bc24058..028c23dbe6 100644 java.net.InetAddress address = ((java.net.InetSocketAddress) networkManager.getSocketAddress()).getAddress(); java.util.UUID uniqueId = i.getId(); diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java -index 3fc232431a..93c014c399 100644 +index f8ec6a5184..33c7a295ea 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java -@@ -463,6 +463,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant Date: Mon, 6 May 2019 01:29:25 -0400 Subject: [PATCH] Per-Player View Distance API placeholders @@ -7,10 +7,10 @@ I hope to look at this more in-depth soon. It appears doable. However this should not block the update. diff --git a/src/main/java/net/minecraft/server/EntityEnderDragon.java b/src/main/java/net/minecraft/server/EntityEnderDragon.java -index 3abf89b741..c558661d20 100644 +index 6d51413d18..fe4a3efa30 100644 --- a/src/main/java/net/minecraft/server/EntityEnderDragon.java +++ b/src/main/java/net/minecraft/server/EntityEnderDragon.java -@@ -565,9 +565,9 @@ public class EntityEnderDragon extends EntityInsentient implements IMonster { +@@ -570,9 +570,9 @@ public class EntityEnderDragon extends EntityInsentient implements IMonster { // CraftBukkit start - Use relative location for far away sounds // this.world.b(1028, new BlockPosition(this), 0); // Paper start diff --git a/work/CraftBukkit b/work/CraftBukkit index 0d76f8658d..d20328368c 160000 --- a/work/CraftBukkit +++ b/work/CraftBukkit @@ -1 +1 @@ -Subproject commit 0d76f8658d22fccee3741792a5cc7048cb6259eb +Subproject commit d20328368cdc37b8b0ef563b97192e22a13126d1