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

Adds a delay to enable conduit power to kick in.

Browse Source 
Can be adjusted via config.yml.

https://github.com/BentoBoxWorld/AcidIsland/issues/51
This commit is contained in:
tastybento 2019-05-15 17:53:49 -07:00
parent 2f30308de7
commit 7415b6db62
2 changed files with 29 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/main/java/world/bentobox/acidisland/AISettings.java
View File

@ -73,6 +73,11 @@ public class AISettings implements WorldSettings {
@ConfigEntry(path = "acid.damage.rain")
private int acidRainDamage = 1;
@ConfigComment("Delay before acid or acid rain starts burning")
@ConfigComment("This can give time for conduit power to kick in")
@ConfigEntry(path = "acid.damage.delay")
private long acidDamageDelay = 2;
@ConfigComment("Portion effects from going into acid water")
@ConfigComment("You can list multiple effects")
@ConfigEntry(path = "acid.damage.effects")
@ -398,6 +403,12 @@ public class AISettings implements WorldSettings {
public int getAcidDamageAnimal() {
return acidDamageAnimal;
}
/**
* @return the acidDamageDelay
*/
public long getAcidDamageDelay() {
return acidDamageDelay;
}
/**
* @return the acidDamageMonster
*/
@ -863,6 +874,12 @@ public class AISettings implements WorldSettings {
public void setAcidDamageChickens(boolean acidDamageChickens) {
this.acidDamageChickens = acidDamageChickens;
}
/**
* @param acidDamageDelay the acidDamageDelay to set
*/
public void setAcidDamageDelay(long acidDamageDelay) {
this.acidDamageDelay = acidDamageDelay;
}
/**
* @param acidDamageMonster the acidDamageMonster to set
*/
@ -1268,4 +1285,6 @@ public class AISettings implements WorldSettings {
public void setWorldName(String worldName) {
this.worldName = worldName;
}
}

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

@ -1,8 +1,9 @@
package world.bentobox.acidisland.listeners;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import org.bukkit.GameMode;
import org.bukkit.Location;
@ -39,8 +40,8 @@ import world.bentobox.bentobox.util.Util;
public class AcidEffect implements Listener {
private final AcidIsland addon;
private final List<Player> burningPlayers = new ArrayList<>();
private final List<Player> wetPlayers = new ArrayList<>();
private final Map<Player, Long> burningPlayers = new HashMap<>();
private final Map<Player, Long> wetPlayers = new HashMap<>();
private static final List<PotionEffectType> EFFECTS = Arrays.asList(
PotionEffectType.BLINDNESS,
PotionEffectType.CONFUSION,
@ -94,10 +95,10 @@ public class AcidEffect implements Listener {
if (addon.getSettings().getAcidRainDamage() > 0D && addon.getOverWorld().hasStorm()) {
if (isSafeFromRain(player)) {
wetPlayers.remove(player);
} else if (!wetPlayers.contains(player)) {
} else if (!wetPlayers.containsKey(player)) {
// Start hurting them
// Add to the list
wetPlayers.add(player);
wetPlayers.put(player, + addon.getSettings().getAcidDamageDelay() * 1000);
// This runnable continuously hurts the player even if
// they are not
// moving but are in acid rain.
@ -110,7 +111,7 @@ public class AcidEffect implements Listener {
wetPlayers.remove(player);
this.cancel();
// Check they are still in this world
} else {
} else if (wetPlayers.containsKey(player) && wetPlayers.get(player) < System.currentTimeMillis()) {
double protection = addon.getSettings().getAcidRainDamage() * getDamageReduced(player);
double totalDamage = Math.max(0, addon.getSettings().getAcidRainDamage() - protection);
AcidRainEvent e = new AcidRainEvent(player, totalDamage, protection);
@ -127,7 +128,7 @@ public class AcidEffect implements Listener {
}
// If they are already burning in acid then return
if (burningPlayers.contains(player)) {
if (burningPlayers.containsKey(player)) {
return;
}
if (isSafeFromAcid(player)) {
@ -135,7 +136,7 @@ public class AcidEffect implements Listener {
}
// ACID!
// Put the player into the acid list
burningPlayers.add(player);
burningPlayers.put(player, System.currentTimeMillis() + addon.getSettings().getAcidDamageDelay() * 1000);
// This runnable continuously hurts the player even if they are not
// moving but are in acid.
new BukkitRunnable() {
@ -144,7 +145,7 @@ public class AcidEffect implements Listener {
if (player.isDead() || isSafeFromAcid(player)) {
burningPlayers.remove(player);
this.cancel();
} else {
} else if (burningPlayers.containsKey(player) && burningPlayers.get(player) < System.currentTimeMillis()) {
double protection = addon.getSettings().getAcidDamage() * getDamageReduced(player);
double totalDamage = Math.max(0, addon.getSettings().getAcidDamage() - protection);
AcidEvent acidEvent = new AcidEvent(player, totalDamage, protection, addon.getSettings().getAcidEffects());