From faf8eb035ae44643471a2cbc383ea74d3284219e Mon Sep 17 00:00:00 2001 From: Mariell Date: Tue, 6 Oct 2020 15:59:35 +0200 Subject: [PATCH] Updated Upstream (CraftBukkit) (#4622) Upstream has released updates that appears to apply and compile correctly. This update has not been tested by PaperMC and as with ANY update, please do your own testing CraftBukkit Changes: 1f4693a8 SPIGOT-6168: Fix error with Player.getBedSpawnLocation when world is unloaded while server running --- .../0567-Fix-NPE-in-getBedSpawnLocation.patch | 28 ------------------- ...reateEvent-needs-to-know-its-entity.patch} | 0 ...ch => 0568-Fix-CraftTeam-null-check.patch} | 0 ...I.patch => 0569-Add-more-Evoker-API.patch} | 0 ...translation-keys-for-blocks-entitie.patch} | 0 ...te-HoverEvent-from-ItemStack-Entity.patch} | 0 ...ch => 0572-Cache-block-data-strings.patch} | 0 ...rtation-and-cancel-velocity-if-tele.patch} | 0 ...tureManager-to-prevent-worldgen-dea.patch} | 0 ...l-open-container-api-to-HumanEntity.patch} | 0 ...aFixerUpper-Rewrite-Rules-on-demand.patch} | 0 ...-capture-to-capture-all-items-added.patch} | 0 ...ty-in-invalid-locations-SPIGOT-6086.patch} | 0 ...-Counter-to-allow-plugins-to-use-va.patch} | 0 ...track-plugin-scoreboards-by-default.patch} | 0 ...king.patch => 0581-Entity-isTicking.patch} | 0 work/CraftBukkit | 2 +- 17 files changed, 1 insertion(+), 29 deletions(-) delete mode 100644 Spigot-Server-Patches/0567-Fix-NPE-in-getBedSpawnLocation.patch rename Spigot-Server-Patches/{0568-PortalCreateEvent-needs-to-know-its-entity.patch => 0567-PortalCreateEvent-needs-to-know-its-entity.patch} (100%) rename Spigot-Server-Patches/{0569-Fix-CraftTeam-null-check.patch => 0568-Fix-CraftTeam-null-check.patch} (100%) rename Spigot-Server-Patches/{0570-Add-more-Evoker-API.patch => 0569-Add-more-Evoker-API.patch} (100%) rename Spigot-Server-Patches/{0571-Add-a-way-to-get-translation-keys-for-blocks-entitie.patch => 0570-Add-a-way-to-get-translation-keys-for-blocks-entitie.patch} (100%) rename Spigot-Server-Patches/{0572-Create-HoverEvent-from-ItemStack-Entity.patch => 0571-Create-HoverEvent-from-ItemStack-Entity.patch} (100%) rename Spigot-Server-Patches/{0573-Cache-block-data-strings.patch => 0572-Cache-block-data-strings.patch} (100%) rename Spigot-Server-Patches/{0574-Fix-Entity-Teleportation-and-cancel-velocity-if-tele.patch => 0573-Fix-Entity-Teleportation-and-cancel-velocity-if-tele.patch} (100%) rename Spigot-Server-Patches/{0575-Use-wrapped-StructureManager-to-prevent-worldgen-dea.patch => 0574-Use-wrapped-StructureManager-to-prevent-worldgen-dea.patch} (100%) rename Spigot-Server-Patches/{0576-Add-additional-open-container-api-to-HumanEntity.patch => 0575-Add-additional-open-container-api-to-HumanEntity.patch} (100%) rename Spigot-Server-Patches/{0577-Cache-DataFixerUpper-Rewrite-Rules-on-demand.patch => 0576-Cache-DataFixerUpper-Rewrite-Rules-on-demand.patch} (100%) rename Spigot-Server-Patches/{0578-Extend-block-drop-capture-to-capture-all-items-added.patch => 0577-Extend-block-drop-capture-to-capture-all-items-added.patch} (100%) rename Spigot-Server-Patches/{0579-Don-t-mark-dirty-in-invalid-locations-SPIGOT-6086.patch => 0578-Don-t-mark-dirty-in-invalid-locations-SPIGOT-6086.patch} (100%) rename Spigot-Server-Patches/{0580-Expose-the-Entity-Counter-to-allow-plugins-to-use-va.patch => 0579-Expose-the-Entity-Counter-to-allow-plugins-to-use-va.patch} (100%) rename Spigot-Server-Patches/{0581-Lazily-track-plugin-scoreboards-by-default.patch => 0580-Lazily-track-plugin-scoreboards-by-default.patch} (100%) rename Spigot-Server-Patches/{0582-Entity-isTicking.patch => 0581-Entity-isTicking.patch} (100%) diff --git a/Spigot-Server-Patches/0567-Fix-NPE-in-getBedSpawnLocation.patch b/Spigot-Server-Patches/0567-Fix-NPE-in-getBedSpawnLocation.patch deleted file mode 100644 index 67e5f480c5..0000000000 --- a/Spigot-Server-Patches/0567-Fix-NPE-in-getBedSpawnLocation.patch +++ /dev/null @@ -1,28 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: JRoy -Date: Fri, 28 Aug 2020 12:01:25 -0400 -Subject: [PATCH] Fix NPE in getBedSpawnLocation - - -diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -index b97be51c6859fa2d45c07c853980adb05d11b65f..715d2c5e888b4a5c955d2dee2429757a27b50b00 100644 ---- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -@@ -874,14 +874,14 @@ public class CraftPlayer extends CraftHumanEntity implements Player { - - @Override - public Location getBedSpawnLocation() { -- World world = getHandle().server.getWorldServer(getHandle().getSpawnDimension()).getWorld(); -+ WorldServer world = getHandle().server.getWorldServer(getHandle().getSpawnDimension()); // Paper - Fix NPE in getBedSpawnLocation - BlockPosition bed = getHandle().getSpawn(); - - if (world != null && bed != null) { -- Optional spawnLoc = EntityHuman.getBed(((CraftWorld) world).getHandle(), bed, getHandle().getSpawnAngle(), getHandle().isSpawnForced(), true); -+ Optional spawnLoc = EntityHuman.getBed(world, bed, getHandle().getSpawnAngle(), getHandle().isSpawnForced(), true); // Paper - Fix NPE in getBedSpawnLocation - if (spawnLoc.isPresent()) { - Vec3D vec = spawnLoc.get(); -- return new Location(world, vec.x, vec.y, vec.z); -+ return new Location(world.getWorld(), vec.x, vec.y, vec.z); // Paper - Fix NPE in getBedSpawnLocation - } - } - return null; diff --git a/Spigot-Server-Patches/0568-PortalCreateEvent-needs-to-know-its-entity.patch b/Spigot-Server-Patches/0567-PortalCreateEvent-needs-to-know-its-entity.patch similarity index 100% rename from Spigot-Server-Patches/0568-PortalCreateEvent-needs-to-know-its-entity.patch rename to Spigot-Server-Patches/0567-PortalCreateEvent-needs-to-know-its-entity.patch diff --git a/Spigot-Server-Patches/0569-Fix-CraftTeam-null-check.patch b/Spigot-Server-Patches/0568-Fix-CraftTeam-null-check.patch similarity index 100% rename from Spigot-Server-Patches/0569-Fix-CraftTeam-null-check.patch rename to Spigot-Server-Patches/0568-Fix-CraftTeam-null-check.patch diff --git a/Spigot-Server-Patches/0570-Add-more-Evoker-API.patch b/Spigot-Server-Patches/0569-Add-more-Evoker-API.patch similarity index 100% rename from Spigot-Server-Patches/0570-Add-more-Evoker-API.patch rename to Spigot-Server-Patches/0569-Add-more-Evoker-API.patch diff --git a/Spigot-Server-Patches/0571-Add-a-way-to-get-translation-keys-for-blocks-entitie.patch b/Spigot-Server-Patches/0570-Add-a-way-to-get-translation-keys-for-blocks-entitie.patch similarity index 100% rename from Spigot-Server-Patches/0571-Add-a-way-to-get-translation-keys-for-blocks-entitie.patch rename to Spigot-Server-Patches/0570-Add-a-way-to-get-translation-keys-for-blocks-entitie.patch diff --git a/Spigot-Server-Patches/0572-Create-HoverEvent-from-ItemStack-Entity.patch b/Spigot-Server-Patches/0571-Create-HoverEvent-from-ItemStack-Entity.patch similarity index 100% rename from Spigot-Server-Patches/0572-Create-HoverEvent-from-ItemStack-Entity.patch rename to Spigot-Server-Patches/0571-Create-HoverEvent-from-ItemStack-Entity.patch diff --git a/Spigot-Server-Patches/0573-Cache-block-data-strings.patch b/Spigot-Server-Patches/0572-Cache-block-data-strings.patch similarity index 100% rename from Spigot-Server-Patches/0573-Cache-block-data-strings.patch rename to Spigot-Server-Patches/0572-Cache-block-data-strings.patch diff --git a/Spigot-Server-Patches/0574-Fix-Entity-Teleportation-and-cancel-velocity-if-tele.patch b/Spigot-Server-Patches/0573-Fix-Entity-Teleportation-and-cancel-velocity-if-tele.patch similarity index 100% rename from Spigot-Server-Patches/0574-Fix-Entity-Teleportation-and-cancel-velocity-if-tele.patch rename to Spigot-Server-Patches/0573-Fix-Entity-Teleportation-and-cancel-velocity-if-tele.patch diff --git a/Spigot-Server-Patches/0575-Use-wrapped-StructureManager-to-prevent-worldgen-dea.patch b/Spigot-Server-Patches/0574-Use-wrapped-StructureManager-to-prevent-worldgen-dea.patch similarity index 100% rename from Spigot-Server-Patches/0575-Use-wrapped-StructureManager-to-prevent-worldgen-dea.patch rename to Spigot-Server-Patches/0574-Use-wrapped-StructureManager-to-prevent-worldgen-dea.patch diff --git a/Spigot-Server-Patches/0576-Add-additional-open-container-api-to-HumanEntity.patch b/Spigot-Server-Patches/0575-Add-additional-open-container-api-to-HumanEntity.patch similarity index 100% rename from Spigot-Server-Patches/0576-Add-additional-open-container-api-to-HumanEntity.patch rename to Spigot-Server-Patches/0575-Add-additional-open-container-api-to-HumanEntity.patch diff --git a/Spigot-Server-Patches/0577-Cache-DataFixerUpper-Rewrite-Rules-on-demand.patch b/Spigot-Server-Patches/0576-Cache-DataFixerUpper-Rewrite-Rules-on-demand.patch similarity index 100% rename from Spigot-Server-Patches/0577-Cache-DataFixerUpper-Rewrite-Rules-on-demand.patch rename to Spigot-Server-Patches/0576-Cache-DataFixerUpper-Rewrite-Rules-on-demand.patch diff --git a/Spigot-Server-Patches/0578-Extend-block-drop-capture-to-capture-all-items-added.patch b/Spigot-Server-Patches/0577-Extend-block-drop-capture-to-capture-all-items-added.patch similarity index 100% rename from Spigot-Server-Patches/0578-Extend-block-drop-capture-to-capture-all-items-added.patch rename to Spigot-Server-Patches/0577-Extend-block-drop-capture-to-capture-all-items-added.patch diff --git a/Spigot-Server-Patches/0579-Don-t-mark-dirty-in-invalid-locations-SPIGOT-6086.patch b/Spigot-Server-Patches/0578-Don-t-mark-dirty-in-invalid-locations-SPIGOT-6086.patch similarity index 100% rename from Spigot-Server-Patches/0579-Don-t-mark-dirty-in-invalid-locations-SPIGOT-6086.patch rename to Spigot-Server-Patches/0578-Don-t-mark-dirty-in-invalid-locations-SPIGOT-6086.patch diff --git a/Spigot-Server-Patches/0580-Expose-the-Entity-Counter-to-allow-plugins-to-use-va.patch b/Spigot-Server-Patches/0579-Expose-the-Entity-Counter-to-allow-plugins-to-use-va.patch similarity index 100% rename from Spigot-Server-Patches/0580-Expose-the-Entity-Counter-to-allow-plugins-to-use-va.patch rename to Spigot-Server-Patches/0579-Expose-the-Entity-Counter-to-allow-plugins-to-use-va.patch diff --git a/Spigot-Server-Patches/0581-Lazily-track-plugin-scoreboards-by-default.patch b/Spigot-Server-Patches/0580-Lazily-track-plugin-scoreboards-by-default.patch similarity index 100% rename from Spigot-Server-Patches/0581-Lazily-track-plugin-scoreboards-by-default.patch rename to Spigot-Server-Patches/0580-Lazily-track-plugin-scoreboards-by-default.patch diff --git a/Spigot-Server-Patches/0582-Entity-isTicking.patch b/Spigot-Server-Patches/0581-Entity-isTicking.patch similarity index 100% rename from Spigot-Server-Patches/0582-Entity-isTicking.patch rename to Spigot-Server-Patches/0581-Entity-isTicking.patch diff --git a/work/CraftBukkit b/work/CraftBukkit index aa8206a857..1f4693a8c3 160000 --- a/work/CraftBukkit +++ b/work/CraftBukkit @@ -1 +1 @@ -Subproject commit aa8206a857fd0828f65a2a4511ddb836b6ee2448 +Subproject commit 1f4693a8c34c5f75accf0b656653b88d69d9fdb3