Upstream/AcidIsland
1
0
Fork 0
mirror of https://github.com/BentoBoxWorld/AcidIsland.git synced 2024-11-25 20:25:37 +01:00
Code Issues Projects Releases Wiki Activity

Fixes #153. Switching to creative didn't stop damage that had started

Browse Source
This commit is contained in:
tastybento 2024-05-16 21:20:55 -07:00
parent 7b232294ed
commit eb1d21fee1
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/main/java/world/bentobox/acidisland/listeners/AcidEffect.java
View File

@ -234,6 +234,7 @@ public class AcidEffect implements Listener {
*/ */
private boolean isSafeFromRain(Player player) { private boolean isSafeFromRain(Player player) {
if (isEssentialsGodMode(player) || player.getWorld().getEnvironment().equals(Environment.NETHER) if (isEssentialsGodMode(player) || player.getWorld().getEnvironment().equals(Environment.NETHER)
|| player.getGameMode() != GameMode.SURVIVAL
|| player.getWorld().getEnvironment().equals(Environment.THE_END) || player.getWorld().getEnvironment().equals(Environment.THE_END)
|| (addon.getSettings().isHelmetProtection() && (player.getInventory().getHelmet() != null || (addon.getSettings().isHelmetProtection() && (player.getInventory().getHelmet() != null
&& player.getInventory().getHelmet().getType().name().contains("HELMET"))) && player.getInventory().getHelmet().getType().name().contains("HELMET")))
@ -264,7 +265,7 @@ public class AcidEffect implements Listener {
*/ */
boolean isSafeFromAcid(Player player) { boolean isSafeFromAcid(Player player) {
// Check for GodMode // Check for GodMode
if (isEssentialsGodMode(player) if (isEssentialsGodMode(player) || player.getGameMode() != GameMode.SURVIVAL
// Protect visitors // Protect visitors
|| (addon.getPlugin().getIWM().getIvSettings(player.getWorld()).contains(DamageCause.CUSTOM.name()) || (addon.getPlugin().getIWM().getIvSettings(player.getWorld()).contains(DamageCause.CUSTOM.name())
&& !addon.getIslands().userIsOnIsland(player.getWorld(), User.getInstance(player)))) { && !addon.getIslands().userIsOnIsland(player.getWorld(), User.getInstance(player)))) {