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

Merge remote-tracking branch 'origin/develop'

Browse Source
This commit is contained in:
tastybento 2019-12-11 16:30:49 -08:00
commit 76c1c8b618
7 changed files with 145 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pom.xml
View File

@ -58,14 +58,14 @@
<!-- Non-minecraft related dependencies -->
<powermock.version>2.0.4</powermock.version>
<!-- More visible way how to change dependency versions -->
<spigot.version>1.14.4-R0.1-SNAPSHOT</spigot.version>
<bentobox.version>1.9.0-SNAPSHOT</bentobox.version>
<spigot.version>1.15-R0.1-SNAPSHOT</spigot.version>
<bentobox.version>1.9.0</bentobox.version>
<!-- Revision variable removes warning about dynamic version -->
<revision>${build.version}-SNAPSHOT</revision>
<!-- Do not change unless you want different name for local builds. -->
<build.number>-LOCAL</build.number>
<!-- This allows to change between versions. -->
<build.version>1.9.0</build.version>
<build.version>1.9.2</build.version>
</properties>
<!-- Profiles will allow to automatically change build version. -->

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

@ -69,7 +69,7 @@ public class AISettings implements WorldSettings {
@ConfigEntry(path = "acid.damage.acid.item")
private long acidDestroyItemTime = 0;
@ConfigComment("Damage from acid rain")
@ConfigComment("Damage from acid rain (and snow, if toggled on).")
@ConfigEntry(path = "acid.damage.rain")
private int acidRainDamage = 1;
@ -82,12 +82,34 @@ public class AISettings implements WorldSettings {
@ConfigEntry(path = "acid.damage.delay")
private long acidDamageDelay = 2;
@ConfigComment("Portion effects from going into acid water")
@ConfigComment("You can list multiple effects")
@ConfigComment("Potion effects from going into acid water.")
@ConfigComment("You can list multiple effects.")
@ConfigComment("Available effects are:")
@ConfigComment(" BLINDNESS")
@ConfigComment(" CONFUSION")
@ConfigComment(" HUNGER")
@ConfigComment(" POISON")
@ConfigComment(" SLOW")
@ConfigComment(" SLOW_DIGGING")
@ConfigComment(" WEAKNESS")
@ConfigEntry(path = "acid.damage.effects")
@Adapter(PotionEffectListAdapter.class)
private List<PotionEffectType> acidEffects = new ArrayList<>();
@ConfigComment("Potion effects from going into acid rain and snow.")
@ConfigComment("You can list multiple effects.")
@ConfigComment("Available effects are:")
@ConfigComment(" BLINDNESS")
@ConfigComment(" CONFUSION")
@ConfigComment(" HUNGER")
@ConfigComment(" POISON")
@ConfigComment(" SLOW")
@ConfigComment(" SLOW_DIGGING")
@ConfigComment(" WEAKNESS")
@ConfigEntry(path = "acid.damage.rain-effects", since = "1.9.1")
@Adapter(PotionEffectListAdapter.class)
private List<PotionEffectType> acidRainEffects = new ArrayList<>();
@ConfigComment("If player wears a helmet then they will not suffer from acid rain")
@ConfigEntry(path = "acid.damage.protection.helmet")
private boolean helmetProtection;
@ -1507,4 +1529,22 @@ public class AISettings implements WorldSettings {
{
this.createIslandOnFirstLoginAbortOnLogout = createIslandOnFirstLoginAbortOnLogout;
}
/**
*
* @return
* @since 1.9.1
*/
public List<PotionEffectType> getAcidRainEffects() {
return acidRainEffects;
}
/**
*
* @param acidRainEffects
* @since 1.9.1
*/
public void setAcidRainEffects(List<PotionEffectType> acidRainEffects) {
this.acidRainEffects = acidRainEffects;
}
}

2
src/main/java/world/bentobox/acidisland/events/AcidEvent.java
View File

@ -21,7 +21,7 @@ public class AcidEvent extends Event implements Cancellable {
private Player player;
private double totalDamage;
private final double protection;
private List<PotionEffectType> potionEffects = new ArrayList<>();
private List<PotionEffectType> potionEffects;
/**
* @param player - player

29
src/main/java/world/bentobox/acidisland/events/AcidRainEvent.java
View File

@ -4,6 +4,9 @@ import org.bukkit.entity.Player;
import org.bukkit.event.Cancellable;
import org.bukkit.event.Event;
import org.bukkit.event.HandlerList;
import org.bukkit.potion.PotionEffectType;
import java.util.List;
/**
* This event is fired when a player is going to be burned by acid rain
@ -17,6 +20,10 @@ public class AcidRainEvent extends Event implements Cancellable {
private Player player;
private double rainDamage;
private final double protection;
/**
* @since 1.9.1
*/
private List<PotionEffectType> potionEffects;
private boolean cancelled;
@ -26,10 +33,11 @@ public class AcidRainEvent extends Event implements Cancellable {
* @param rainDamage
* @param protection
*/
public AcidRainEvent(Player player, double rainDamage, double protection) {
public AcidRainEvent(Player player, double rainDamage, double protection, List<PotionEffectType> potionEffects) {
this.player = player;
this.rainDamage = rainDamage;
this.protection = protection;
this.potionEffects = potionEffects;
}
/**
@ -69,6 +77,25 @@ public class AcidRainEvent extends Event implements Cancellable {
this.rainDamage = rainDamage;
}
/**
* Returns the potion effects that will be applied to the player.
* @return
* @since 1.9.1
*/
public List<PotionEffectType> getPotionEffects() {
return potionEffects;
}
/**
*
* @param potionEffects the potionEffects to set
* @return
* @since 1.9.1
*/
public void setPotionEffects(List<PotionEffectType> potionEffects) {
this.potionEffects = potionEffects;
}
@Override
public HandlerList getHandlers() {
return handlers;

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

@ -9,6 +9,7 @@ import org.bukkit.GameMode;
import org.bukkit.Location;
import org.bukkit.Material;
import org.bukkit.Sound;
import org.bukkit.World.Environment;
import org.bukkit.attribute.Attribute;
import org.bukkit.block.BlockFace;
import org.bukkit.entity.EntityType;
@ -116,14 +117,19 @@ public class AcidEffect implements Listener {
} 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);
addon.getServer().getPluginManager().callEvent(e);
if (!e.isCancelled()) {
player.damage(e.getRainDamage());
AcidRainEvent event = new AcidRainEvent(player, totalDamage, protection, addon.getSettings().getAcidRainEffects());
addon.getServer().getPluginManager().callEvent(event);
if (!event.isCancelled()) {
event.getPotionEffects().stream().filter(EFFECTS::contains).forEach(t -> player.addPotionEffect(new PotionEffect(t, 600, 1)));
event.getPotionEffects().stream().filter(e -> e.equals(PotionEffectType.POISON)).forEach(t -> player.addPotionEffect(new PotionEffect(t, 200, 1)));
// Apply damage if there is any
if (event.getRainDamage() > 0D) {
player.damage(event.getRainDamage());
player.getWorld().playSound(playerLoc, Sound.ENTITY_CREEPER_PRIMED, 3F, 3F);
}
}
}
}
}.runTaskTimer(addon.getPlugin(), 0L, 20L);
}
@ -172,11 +178,13 @@ public class AcidEffect implements Listener {
* @return true if they are safe
*/
private boolean isSafeFromRain(Player player) {
if (addon.getSettings().isHelmetProtection() && (player.getInventory().getHelmet() != null
&& player.getInventory().getHelmet().getType().name().contains("HELMET"))
if (player.getWorld().getEnvironment().equals(Environment.NETHER)
|| player.getWorld().getEnvironment().equals(Environment.THE_END)
|| (addon.getSettings().isHelmetProtection() && (player.getInventory().getHelmet() != null && player.getInventory().getHelmet().getType().name().contains("HELMET")))
|| (!addon.getSettings().isAcidDamageSnow() && player.getLocation().getBlock().getTemperature() < 0.1) // snow falls
|| player.getLocation().getBlock().getHumidity() == 0 // dry
|| (player.getActivePotionEffects().stream().map(PotionEffect::getType).anyMatch(IMMUNE_EFFECTS::contains))) {
|| (player.getActivePotionEffects().stream().map(PotionEffect::getType).anyMatch(IMMUNE_EFFECTS::contains))
) {
return true;
}
// Check if all air above player

21
src/test/java/world/bentobox/acidisland/events/AcidRainEventTest.java
View File

@ -7,19 +7,27 @@ import static org.junit.Assert.assertTrue;
import static org.mockito.Mockito.mock;
import org.bukkit.entity.Player;
import org.bukkit.potion.PotionEffectType;
import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
import org.mockito.Mock;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
public class AcidRainEventTest {
@Mock
private Player player;
private List<PotionEffectType> effects;
private AcidRainEvent e;
@Before
public void setUp() throws Exception {
e = new AcidRainEvent(player, 10, 5);
effects = Arrays.asList(PotionEffectType.values());
e = new AcidRainEvent(player, 10, 5, effects);
}
@Test
@ -55,6 +63,17 @@ public class AcidRainEventTest {
assertTrue(e.getRainDamage() == 50D);
}
@Test
public void testGetPotionEffects() {
Assert.assertArrayEquals(PotionEffectType.values(), e.getPotionEffects().toArray());
}
@Test
public void testSetPotionEffects() {
e.setPotionEffects(new ArrayList<>());
assertTrue(e.getPotionEffects().isEmpty());
}
@Test
public void testIsCancelled() {
assertFalse(e.isCancelled());

34
src/test/java/world/bentobox/acidisland/listeners/AcidEffectTest.java
View File

@ -18,6 +18,7 @@ import org.bukkit.GameMode;
import org.bukkit.Location;
import org.bukkit.Material;
import org.bukkit.World;
import org.bukkit.World.Environment;
import org.bukkit.attribute.Attribute;
import org.bukkit.attribute.AttributeInstance;
import org.bukkit.block.Block;
@ -146,6 +147,7 @@ public class AcidEffectTest {
when(world.hasStorm()).thenReturn(true);
when(world.getBlockAt(anyInt(), anyInt(), anyInt())).thenReturn(airBlock);
when(world.getMaxHeight()).thenReturn(5);
when(world.getEnvironment()).thenReturn(Environment.NORMAL);
ae = new AcidEffect(addon);
}
@ -305,6 +307,38 @@ public class AcidEffectTest {
verify(settings).getAcidDamageDelay();
}
/**
* Test method for {@link world.bentobox.acidisland.listeners.AcidEffect#onPlayerMove(org.bukkit.event.player.PlayerMoveEvent)}.
*/
@Test
public void testOnPlayerMoveAcidRainWrongWorld() {
World nether = mock(World.class);
when(nether.getName()).thenReturn("world_nether");
when(nether.getEnvironment()).thenReturn(Environment.NETHER);
when(player.getWorld()).thenReturn(nether);
PlayerMoveEvent e = new PlayerMoveEvent(player, from, to);
ae.onPlayerMove(e);
// 2 times only
verify(addon, times(2)).getPlugin();
}
/**
* Test method for {@link world.bentobox.acidisland.listeners.AcidEffect#onPlayerMove(org.bukkit.event.player.PlayerMoveEvent)}.
*/
@Test
public void testOnPlayerMoveAcidRainWrongWorldEnd() {
World end = mock(World.class);
when(end.getName()).thenReturn("world_end");
when(end.getEnvironment()).thenReturn(Environment.THE_END);
when(player.getWorld()).thenReturn(end);
PlayerMoveEvent e = new PlayerMoveEvent(player, from, to);
ae.onPlayerMove(e);
// 2 times only
verify(addon, times(2)).getPlugin();
}
/**
* Test method for {@link world.bentobox.acidisland.listeners.AcidEffect#onPlayerMove(org.bukkit.event.player.PlayerMoveEvent)}.
*/