Upstream/bentobox
1
0
Fork 0
mirror of https://github.com/BentoBoxWorld/BentoBox.git synced 2024-09-28 22:57:31 +02:00
Code Issues Projects Releases Wiki Activity

Revert "Reworks how dragons are removed."

Browse Source 
This reverts commit af9de5580a.
This commit is contained in:
tastybento 2019-02-05 22:54:48 -08:00
parent af9de5580a
commit 446028fbae
2 changed files with 14 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
src/main/java/world/bentobox/bentobox/listeners/BlockEndDragon.java
View File

@ -1,23 +1,17 @@
package world.bentobox.bentobox.listeners;
import java.util.Arrays;
import java.util.HashSet;
import java.util.List;
import java.util.Set;
import java.util.UUID;
import org.bukkit.Bukkit;
import org.bukkit.Material;
import org.bukkit.World.Environment;
import org.bukkit.entity.EnderDragon;
import org.bukkit.entity.EntityType;
import org.bukkit.event.EventHandler;
import org.bukkit.event.EventPriority;
import org.bukkit.event.Listener;
import org.bukkit.event.block.BlockPlaceEvent;
import org.bukkit.event.entity.CreatureSpawnEvent;
import org.bukkit.event.entity.CreatureSpawnEvent.SpawnReason;
import org.bukkit.event.entity.EntityDeathEvent;
import org.bukkit.event.world.ChunkLoadEvent;
import world.bentobox.bentobox.BentoBox;
@ -36,8 +30,6 @@ public class BlockEndDragon implements Listener {
private BentoBox plugin;
private Set<UUID> enderDragons = new HashSet<>();
public BlockEndDragon(BentoBox plugin) {
this.plugin = plugin;
}
@ -50,31 +42,19 @@ public class BlockEndDragon implements Listener {
*/
@EventHandler(priority = EventPriority.LOWEST, ignoreCancelled = true)
public boolean onDragonSpawn(CreatureSpawnEvent e) {
if (!e.getSpawnReason().equals(SpawnReason.NATURAL)
|| !e.getEntityType().equals(EntityType.ENDER_DRAGON)
|| plugin.getIWM().isDragonSpawn(e.getEntity().getWorld())) {
if (!e.getEntityType().equals(EntityType.ENDER_DRAGON) || plugin.getIWM().isDragonSpawn(e.getEntity().getWorld())) {
return true;
}
EnderDragon d = (EnderDragon)e.getEntity();
d.getBossBar().setVisible(false);
d.setHealth(0);
enderDragons.add(d.getUniqueId());
e.getEntity().setHealth(0);
e.getEntity().remove();
e.setCancelled(true);
return false;
}
@EventHandler(priority = EventPriority.LOWEST, ignoreCancelled = true)
public void onDragonDeath(EntityDeathEvent e) {
if (enderDragons.contains(e.getEntity().getUniqueId())) {
plugin.logDebug("removing drops");
e.setDroppedExp(0);
e.getDrops().clear();
enderDragons.remove(e.getEntity().getUniqueId());
}
}
/**
* This listener aims to delete the end trophy from the end when it is generated
* It is added by special code in the server that can't be overridden so the only
* It is added by special code in the server that can't be overidden so the only
* option is to delete it manually. This means that any island at 0,0 will have
* a dead zone of a few blocks directly above it. Hopefully this will not be a
* major issue.

19
src/test/java/world/bentobox/bentobox/listeners/BlockEndDragonTest.java
View File

@ -7,12 +7,9 @@ import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
import org.bukkit.Bukkit;
import org.bukkit.boss.BossBar;
import org.bukkit.entity.EnderDragon;
import org.bukkit.entity.EntityType;
import org.bukkit.entity.LivingEntity;
import org.bukkit.event.entity.CreatureSpawnEvent;
import org.bukkit.event.entity.CreatureSpawnEvent.SpawnReason;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.mockito.Mockito;
@ -38,7 +35,7 @@ public class BlockEndDragonTest {
public void testOnDragonSpawnWrongEntityOkayToSpawn() {
LivingEntity le = mock(LivingEntity.class);
when(le.getType()).thenReturn(EntityType.AREA_EFFECT_CLOUD);
CreatureSpawnEvent event = new CreatureSpawnEvent(le, SpawnReason.NATURAL);
CreatureSpawnEvent event = new CreatureSpawnEvent(le, null);
BentoBox plugin = mock(BentoBox.class);
IslandWorldManager iwm = mock(IslandWorldManager.class);
when(plugin.getIWM()).thenReturn(iwm);
@ -53,7 +50,7 @@ public class BlockEndDragonTest {
public void testOnDragonSpawnWrongEntityNoDragonSpawn() {
LivingEntity le = mock(LivingEntity.class);
when(le.getType()).thenReturn(EntityType.AREA_EFFECT_CLOUD);
CreatureSpawnEvent event = new CreatureSpawnEvent(le, SpawnReason.NATURAL);
CreatureSpawnEvent event = new CreatureSpawnEvent(le, null);
BentoBox plugin = mock(BentoBox.class);
IslandWorldManager iwm = mock(IslandWorldManager.class);
when(plugin.getIWM()).thenReturn(iwm);
@ -66,9 +63,9 @@ public class BlockEndDragonTest {
@Test
public void testOnDragonSpawnRightEntityOkayToSpawn() {
EnderDragon le = mock(EnderDragon.class);
LivingEntity le = mock(LivingEntity.class);
when(le.getType()).thenReturn(EntityType.ENDER_DRAGON);
CreatureSpawnEvent event = new CreatureSpawnEvent(le, SpawnReason.NATURAL);
CreatureSpawnEvent event = new CreatureSpawnEvent(le, null);
BentoBox plugin = mock(BentoBox.class);
IslandWorldManager iwm = mock(IslandWorldManager.class);
when(plugin.getIWM()).thenReturn(iwm);
@ -81,10 +78,9 @@ public class BlockEndDragonTest {
@Test
public void testOnDragonSpawnRightEntityNotOkayToSpawn() {
EnderDragon le = mock(EnderDragon.class);
when(le.getBossBar()).thenReturn(mock(BossBar.class));
LivingEntity le = mock(LivingEntity.class);
when(le.getType()).thenReturn(EntityType.ENDER_DRAGON);
CreatureSpawnEvent event = new CreatureSpawnEvent(le, SpawnReason.NATURAL);
CreatureSpawnEvent event = new CreatureSpawnEvent(le, null);
BentoBox plugin = mock(BentoBox.class);
IslandWorldManager iwm = mock(IslandWorldManager.class);
when(plugin.getIWM()).thenReturn(iwm);
@ -92,6 +88,9 @@ public class BlockEndDragonTest {
when(iwm.isDragonSpawn(Mockito.any())).thenReturn(false);
BlockEndDragon bed = new BlockEndDragon(plugin);
assertFalse(bed.onDragonSpawn(event));
Mockito.verify(le).remove();
Mockito.verify(le).setHealth(0);
assertTrue(event.isCancelled());
}
}