Repo-Mirror/HMCCosmetics
9
0
Fork 0
mirror of https://github.com/HibiscusMC/HMCCosmetics.git synced 2025-12-19 23:19:22 +00:00
Code Issues Releases Activity

chore: move away from internally deprecated methods

Browse Source
This commit is contained in:
LoJoSho
2025-01-16 12:45:53 -06:00
parent 5779d278a9
commit 0477e801a6
3 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
common/src/main/java/com/hibiscusmc/hmccosmetics/command/CosmeticCommand.java
View File

@@ -243,9 +243,9 @@ public class CosmeticCommand implements CommandExecutor {
CosmeticUser user = CosmeticUsers.getUser(player); CosmeticUser user = CosmeticUsers.getUser(player);
if (user.isInWardrobe()) { if (user.isInWardrobe()) {
user.leaveWardrobe(); user.leaveWardrobe(false);
} else { } else {
user.enterWardrobe(false, wardrobe); user.enterWardrobe(wardrobe, false);
} }
return true; return true;
} }

4
common/src/main/java/com/hibiscusmc/hmccosmetics/hooks/worldguard/WGListener.java
View File

@@ -46,7 +46,7 @@ public class WGListener implements Listener {
if (protectedRegion.getFlags().containsKey(WGHook.getCosmeticWardrobeFlag())) { if (protectedRegion.getFlags().containsKey(WGHook.getCosmeticWardrobeFlag())) {
if (!WardrobeSettings.getWardrobeNames().contains(protectedRegion.getFlags().get(WGHook.getCosmeticWardrobeFlag()).toString())) return; if (!WardrobeSettings.getWardrobeNames().contains(protectedRegion.getFlags().get(WGHook.getCosmeticWardrobeFlag()).toString())) return;
Wardrobe wardrobe = WardrobeSettings.getWardrobe(protectedRegion.getFlags().get(WGHook.getCosmeticWardrobeFlag()).toString()); Wardrobe wardrobe = WardrobeSettings.getWardrobe(protectedRegion.getFlags().get(WGHook.getCosmeticWardrobeFlag()).toString());
user.enterWardrobe(true, wardrobe); user.enterWardrobe(wardrobe, true);
} }
} }
} }
@@ -74,7 +74,7 @@ public class WGListener implements Listener {
if (protectedRegion.getFlags().containsKey(WGHook.getCosmeticWardrobeFlag())) { if (protectedRegion.getFlags().containsKey(WGHook.getCosmeticWardrobeFlag())) {
if (!WardrobeSettings.getWardrobeNames().contains(protectedRegion.getFlags().get(WGHook.getCosmeticWardrobeFlag()).toString())) return; if (!WardrobeSettings.getWardrobeNames().contains(protectedRegion.getFlags().get(WGHook.getCosmeticWardrobeFlag()).toString())) return;
Wardrobe wardrobe = WardrobeSettings.getWardrobe(protectedRegion.getFlags().get(WGHook.getCosmeticWardrobeFlag()).toString()); Wardrobe wardrobe = WardrobeSettings.getWardrobe(protectedRegion.getFlags().get(WGHook.getCosmeticWardrobeFlag()).toString());
user.enterWardrobe(true, wardrobe); user.enterWardrobe(wardrobe, true);
} }
} }
} }

8
common/src/main/java/com/hibiscusmc/hmccosmetics/listener/PlayerGameListener.java
View File

@@ -111,7 +111,7 @@ public class PlayerGameListener implements Listener {
if (!event.isSneaking()) return; if (!event.isSneaking()) return;
if (!user.isInWardrobe()) return; if (!user.isInWardrobe()) return;
user.leaveWardrobe(); user.leaveWardrobe(false);
} }
@EventHandler(priority = EventPriority.LOW, ignoreCancelled = true) @EventHandler(priority = EventPriority.LOW, ignoreCancelled = true)
@@ -125,7 +125,7 @@ public class PlayerGameListener implements Listener {
} }
if (user.isInWardrobe()) { if (user.isInWardrobe()) {
user.leaveWardrobe(); user.leaveWardrobe(false);
} }
Bukkit.getScheduler().runTaskLater(HMCCosmeticsPlugin.getInstance(), () -> { Bukkit.getScheduler().runTaskLater(HMCCosmeticsPlugin.getInstance(), () -> {
@@ -202,7 +202,7 @@ public class PlayerGameListener implements Listener {
event.setCancelled(true); event.setCancelled(true);
return; return;
} }
if (WardrobeSettings.isDamagedKicked()) user.leaveWardrobe(); if (WardrobeSettings.isDamagedKicked()) user.leaveWardrobe(false);
} }
} }
@@ -345,7 +345,7 @@ public class PlayerGameListener implements Listener {
CosmeticUser user = CosmeticUsers.getUser(event.getEntity()); CosmeticUser user = CosmeticUsers.getUser(event.getEntity());
if (user == null) return; if (user == null) return;
if (user.isInWardrobe()) user.leaveWardrobe(); if (user.isInWardrobe()) user.leaveWardrobe(false);
if (Settings.isUnapplyOnDeath() && !event.getEntity().hasPermission("hmccosmetics.unapplydeath.bypass")) { if (Settings.isUnapplyOnDeath() && !event.getEntity().hasPermission("hmccosmetics.unapplydeath.bypass")) {
user.removeCosmetics(); user.removeCosmetics();