From b0d6227f97c3a508faab9796acdbef7536b1013e Mon Sep 17 00:00:00 2001 From: CrystalD5 Date: Mon, 9 Mar 2026 21:17:49 +0100 Subject: [PATCH] Changed version in method selection condition Fixed condition to reflect Player.getRespawnLocation() not being available until version 1.20.4 Added 1.20.4 to the VersionUtil list --- .../main/java/com/earth2me/essentials/utils/VersionUtil.java | 1 + .../essentials/spawn/EssentialsSpawnPlayerListener.java | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/Essentials/src/main/java/com/earth2me/essentials/utils/VersionUtil.java b/Essentials/src/main/java/com/earth2me/essentials/utils/VersionUtil.java index 0caf7ea6659..6455611df7d 100644 --- a/Essentials/src/main/java/com/earth2me/essentials/utils/VersionUtil.java +++ b/Essentials/src/main/java/com/earth2me/essentials/utils/VersionUtil.java @@ -40,6 +40,7 @@ public final class VersionUtil { public static final BukkitVersion v1_19_R01 = BukkitVersion.fromString("1.19-R0.1-SNAPSHOT"); public static final BukkitVersion v1_19_4_R01 = BukkitVersion.fromString("1.19.4-R0.1-SNAPSHOT"); public static final BukkitVersion v1_20_1_R01 = BukkitVersion.fromString("1.20.1-R0.1-SNAPSHOT"); + public static final BukkitVersion v1_20_4_R01 = BukkitVersion.fromString("1.20.4-R0.1-SNAPSHOT"); public static final BukkitVersion v1_20_6_R01 = BukkitVersion.fromString("1.20.6-R0.1-SNAPSHOT"); public static final BukkitVersion v1_21_R01 = BukkitVersion.fromString("1.21-R0.1-SNAPSHOT"); public static final BukkitVersion v1_21_3_R01 = BukkitVersion.fromString("1.21.3-R0.1-SNAPSHOT"); diff --git a/EssentialsSpawn/src/main/java/com/earth2me/essentials/spawn/EssentialsSpawnPlayerListener.java b/EssentialsSpawn/src/main/java/com/earth2me/essentials/spawn/EssentialsSpawnPlayerListener.java index 6f2b8902af7..bf6e19492d3 100644 --- a/EssentialsSpawn/src/main/java/com/earth2me/essentials/spawn/EssentialsSpawnPlayerListener.java +++ b/EssentialsSpawn/src/main/java/com/earth2me/essentials/spawn/EssentialsSpawnPlayerListener.java @@ -49,9 +49,9 @@ void onPlayerRespawn(final PlayerRespawnEvent event) { (!VersionUtil.getServerBukkitVersion().isHigherThanOrEqualTo(VersionUtil.v1_16_1_R01) || (!event.isAnchorSpawn() || ess.getSettings().isRespawnAtAnchor()))) { // cannot nuke this sync load due to the event being sync so it would hand either way - if(VersionUtil.getServerBukkitVersion().isHigherThanOrEqualTo(VersionUtil.v1_16_1_R01)) { + if(VersionUtil.getServerBukkitVersion().isHigherThanOrEqualTo(VersionUtil.v1_20_4_R01)) { respawnLocation = user.getBase().getRespawnLocation(); - } else { // For versions prior to 1.16. + } else { // For versions prior to 1.20.4. respawnLocation = user.getBase().getBedSpawnLocation(); } }