From f843d41d616d4a078a44e3f61e657769bb8de61f Mon Sep 17 00:00:00 2001 From: MobiusDevelopment <8391001+MobiusDevelopment@users.noreply.github.com> Date: Tue, 4 Jan 2022 23:59:59 +0000 Subject: [PATCH] Fixed InstanceWorld allowed player methods. Thanks to Lito. --- .../model/instancezone/InstanceWorld.java | 19 +++++++++++++------ .../model/instancezone/InstanceWorld.java | 19 +++++++++++++------ 2 files changed, 26 insertions(+), 12 deletions(-) diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/instancezone/InstanceWorld.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/instancezone/InstanceWorld.java index 0b9afe4813..80581f09a7 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/instancezone/InstanceWorld.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/instancezone/InstanceWorld.java @@ -84,22 +84,29 @@ public class InstanceWorld public void removeAllowed(Player player) { - final Integer playerId = player.getId(); - _allowed.remove(playerId); + _allowed.remove(player.getObjectId()); } + /** + * Add player who can enter to instance. + * @param player player instance + */ public void addAllowed(Player player) { - final Integer playerId = player.getId(); - if (!_allowed.contains(playerId)) + if (!_allowed.contains(player.getObjectId())) { - _allowed.add(playerId); + _allowed.add(player.getObjectId()); } } + /** + * Check if player can enter to instance. + * @param player player itself + * @return {@code true} when can enter, otherwise {@code false} + */ public boolean isAllowed(Player player) { - return _allowed.contains(player.getId()); + return _allowed.contains(player.getObjectId()); } /** diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/instancezone/InstanceWorld.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/instancezone/InstanceWorld.java index 0b9afe4813..80581f09a7 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/instancezone/InstanceWorld.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/instancezone/InstanceWorld.java @@ -84,22 +84,29 @@ public class InstanceWorld public void removeAllowed(Player player) { - final Integer playerId = player.getId(); - _allowed.remove(playerId); + _allowed.remove(player.getObjectId()); } + /** + * Add player who can enter to instance. + * @param player player instance + */ public void addAllowed(Player player) { - final Integer playerId = player.getId(); - if (!_allowed.contains(playerId)) + if (!_allowed.contains(player.getObjectId())) { - _allowed.add(playerId); + _allowed.add(player.getObjectId()); } } + /** + * Check if player can enter to instance. + * @param player player itself + * @return {@code true} when can enter, otherwise {@code false} + */ public boolean isAllowed(Player player) { - return _allowed.contains(player.getId()); + return _allowed.contains(player.getObjectId()); } /**