From d465800774e85fe6f5921b5dd0c7b6d9d161c5b1 Mon Sep 17 00:00:00 2001 From: Jason Penilla <11360596+jpenilla@users.noreply.github.com> Date: Sun, 13 Jun 2021 20:06:11 -0700 Subject: [PATCH] small fixes --- ...llow-multiple-callbacks-to-schedule-for-Callback-Ex.patch | 5 ++++- .../server/implement-optional-per-player-mob-spawns.patch | 4 ++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/patches/server/Allow-multiple-callbacks-to-schedule-for-Callback-Ex.patch b/patches/server/Allow-multiple-callbacks-to-schedule-for-Callback-Ex.patch index 45a8e53363..3e1e2807fa 100644 --- a/patches/server/Allow-multiple-callbacks-to-schedule-for-Callback-Ex.patch +++ b/patches/server/Allow-multiple-callbacks-to-schedule-for-Callback-Ex.patch @@ -44,5 +44,8 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 + this.queue = null; + // Paper end Runnable task; - while ((task = this.queue.poll()) != null) { +- while ((task = this.queue.poll()) != null) { ++ while ((task = queue.poll()) != null) { // Paper task.run(); + } + } diff --git a/patches/server/implement-optional-per-player-mob-spawns.patch b/patches/server/implement-optional-per-player-mob-spawns.patch index a418fe00e6..0b49db722e 100644 --- a/patches/server/implement-optional-per-player-mob-spawns.patch +++ b/patches/server/implement-optional-per-player-mob-spawns.patch @@ -92,7 +92,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 + + gone.remove(player); + -+ final SectionPos newPosition = player.getPlayerMapSection(); ++ final SectionPos newPosition = player.getLastSectionPos(); + final SectionPos oldPosition = this.players.put(player, newPosition); + + if (oldPosition == null) { @@ -117,7 +117,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 + int expectedEntries = (2 * viewDistance + 1); + expectedEntries *= expectedEntries; + -+ final SectionPos currPosition = player.getPlayerMapSection(); ++ final SectionPos currPosition = player.getLastSectionPos(); + + final int centerX = currPosition.getX(); + final int centerZ = currPosition.getZ();