mirror of
https://github.com/BentoBoxWorld/BentoBox.git
synced 2024-11-01 00:10:40 +01:00
Change how creeper damage flag works. #2507
This commit is contained in:
parent
060e700fce
commit
625bfa631b
@ -141,7 +141,6 @@ public class Settings implements ConfigObject {
|
||||
private Set<String> fakePlayers = new HashSet<>();
|
||||
|
||||
/* PANELS */
|
||||
|
||||
@ConfigComment("Toggle whether panels should be closed or not when the player clicks anywhere outside of the inventory view.")
|
||||
@ConfigEntry(path = "panel.close-on-click-outside")
|
||||
private boolean closePanelOnClickOutside = true;
|
||||
@ -189,6 +188,13 @@ public class Settings implements ConfigObject {
|
||||
/*
|
||||
* Island
|
||||
*/
|
||||
@ConfigComment("Override island distance mismatch checking. BentoBox normally refuses to run if")
|
||||
@ConfigComment("the island distance in the gamemode config is different to the one stored in the database")
|
||||
@ConfigComment("for safety. This overrides that check. You should never need this, and if you do not understand it")
|
||||
@ConfigComment("keep it as false")
|
||||
@ConfigEntry(path = "island.override-safety-check")
|
||||
private boolean overrideSafetyCheck = false;
|
||||
|
||||
// Number of islands
|
||||
@ConfigComment("The default number of concurrent islands a player may have.")
|
||||
@ConfigComment("This may be overridden by individual game mode config settings.")
|
||||
@ -1034,4 +1040,18 @@ public class Settings implements ConfigObject {
|
||||
this.hideUsedBlueprints = hideUsedBlueprints;
|
||||
}
|
||||
|
||||
/**
|
||||
* @return the overrideSafetyCheck
|
||||
*/
|
||||
public boolean isOverrideSafetyCheck() {
|
||||
return overrideSafetyCheck;
|
||||
}
|
||||
|
||||
/**
|
||||
* @param overrideSafetyCheck the overrideSafetyCheck to set
|
||||
*/
|
||||
public void setOverrideSafetyCheck(boolean overrideSafetyCheck) {
|
||||
this.overrideSafetyCheck = overrideSafetyCheck;
|
||||
}
|
||||
|
||||
}
|
||||
|
@ -20,6 +20,7 @@ import org.bukkit.event.player.PlayerInteractEvent;
|
||||
import com.google.common.base.Enums;
|
||||
import com.google.common.base.Optional;
|
||||
|
||||
import world.bentobox.bentobox.BentoBox;
|
||||
import world.bentobox.bentobox.api.flags.FlagListener;
|
||||
import world.bentobox.bentobox.lists.Flags;
|
||||
|
||||
|
@ -13,6 +13,7 @@ import org.bukkit.event.entity.EntityDamageEvent;
|
||||
import org.bukkit.event.entity.EntityExplodeEvent;
|
||||
import org.bukkit.event.player.PlayerInteractEntityEvent;
|
||||
|
||||
import world.bentobox.bentobox.BentoBox;
|
||||
import world.bentobox.bentobox.api.flags.FlagListener;
|
||||
import world.bentobox.bentobox.api.localization.TextVariables;
|
||||
import world.bentobox.bentobox.api.user.User;
|
||||
@ -40,7 +41,8 @@ public class CreeperListener extends FlagListener {
|
||||
if (!Flags.CREEPER_DAMAGE.isSetForWorld(e.getLocation().getWorld())) {
|
||||
// If any were removed, then prevent damage too
|
||||
e.blockList().clear();
|
||||
e.setCancelled(true);
|
||||
// Still allow player and mob damage
|
||||
e.setCancelled(false);
|
||||
return;
|
||||
}
|
||||
// Check for griefing
|
||||
@ -55,25 +57,6 @@ public class CreeperListener extends FlagListener {
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* Prevent entities being damaged by explosion
|
||||
* @param e - event
|
||||
* @since 1.10.0
|
||||
*/
|
||||
@EventHandler(priority = EventPriority.LOW, ignoreCancelled = true)
|
||||
public void onExplosion(final EntityDamageByEntityEvent e) {
|
||||
if (!e.getCause().equals(EntityDamageEvent.DamageCause.ENTITY_EXPLOSION) || !getIWM().inWorld(e.getEntity().getLocation())
|
||||
|| !e.getDamager().getType().equals(EntityType.CREEPER)) {
|
||||
return;
|
||||
}
|
||||
// If creeper damage is not allowed in world cancel the damage
|
||||
if (!Flags.CREEPER_DAMAGE.isSetForWorld(e.getEntity().getWorld())) {
|
||||
e.setCancelled(true);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* Prevent creepers from igniting if they are not allowed to grief
|
||||
* @param e - event
|
||||
|
@ -1267,7 +1267,8 @@ public class IslandsManager {
|
||||
// These will be deleted later
|
||||
deletedIslands.add(island.getUniqueId());
|
||||
} // Check island distance and if incorrect stop BentoBox
|
||||
else if (island.getWorld() != null && plugin.getIWM().inWorld(island.getWorld())
|
||||
else if (!plugin.getSettings().isOverrideSafetyCheck() && island.getWorld() != null
|
||||
&& plugin.getIWM().inWorld(island.getWorld())
|
||||
&& island.getRange() != plugin.getIWM().getIslandDistance(island.getWorld())) {
|
||||
throw new IOException("Island distance mismatch!\n" + "World '" + island.getWorld().getName()
|
||||
+ "' distance " + plugin.getIWM().getIslandDistance(island.getWorld()) + " != island range "
|
||||
|
@ -0,0 +1,44 @@
|
||||
package world.bentobox.bentobox.listeners.flags.worldsettings;
|
||||
|
||||
import static org.junit.Assert.*;
|
||||
|
||||
import org.junit.After;
|
||||
import org.junit.Before;
|
||||
import org.junit.Test;
|
||||
|
||||
/**
|
||||
*
|
||||
*/
|
||||
public class CreeperListenerTest {
|
||||
|
||||
/**
|
||||
* @throws java.lang.Exception
|
||||
*/
|
||||
@Before
|
||||
public void setUp() throws Exception {
|
||||
}
|
||||
|
||||
/**
|
||||
* @throws java.lang.Exception
|
||||
*/
|
||||
@After
|
||||
public void tearDown() throws Exception {
|
||||
}
|
||||
|
||||
/**
|
||||
* Test method for {@link world.bentobox.bentobox.listeners.flags.worldsettings.CreeperListener#onExplosion(org.bukkit.event.entity.EntityExplodeEvent)}.
|
||||
*/
|
||||
@Test
|
||||
public void testOnExplosion() {
|
||||
fail("Not yet implemented");
|
||||
}
|
||||
|
||||
/**
|
||||
* Test method for {@link world.bentobox.bentobox.listeners.flags.worldsettings.CreeperListener#onPlayerInteractEntity(org.bukkit.event.player.PlayerInteractEntityEvent)}.
|
||||
*/
|
||||
@Test
|
||||
public void testOnPlayerInteractEntity() {
|
||||
fail("Not yet implemented");
|
||||
}
|
||||
|
||||
}
|
@ -153,6 +153,8 @@ public class IslandsManagerTest extends AbstractCommonSetup {
|
||||
// Class under test
|
||||
IslandsManager im;
|
||||
|
||||
private Settings settings;
|
||||
|
||||
@SuppressWarnings("unchecked")
|
||||
@BeforeClass
|
||||
public static void beforeClass() throws IllegalAccessException, InvocationTargetException, IntrospectionException {
|
||||
@ -187,12 +189,12 @@ public class IslandsManagerTest extends AbstractCommonSetup {
|
||||
when(world.getEnvironment()).thenReturn(World.Environment.NORMAL);
|
||||
when(iwm.inWorld(any(World.class))).thenReturn(true);
|
||||
when(iwm.inWorld(any(Location.class))).thenReturn(true);
|
||||
when(iwm.getIslandDistance(any())).thenReturn(25);
|
||||
when(plugin.getIWM()).thenReturn(iwm);
|
||||
|
||||
// Settings
|
||||
Settings s = mock(Settings.class);
|
||||
when(plugin.getSettings()).thenReturn(s);
|
||||
when(s.getDatabaseType()).thenReturn(DatabaseType.JSON);
|
||||
settings = new Settings();
|
||||
when(plugin.getSettings()).thenReturn(settings);
|
||||
|
||||
// World
|
||||
when(world.getEnvironment()).thenReturn(World.Environment.NORMAL);
|
||||
@ -827,14 +829,41 @@ public class IslandsManagerTest extends AbstractCommonSetup {
|
||||
/**
|
||||
* Test method for
|
||||
* {@link world.bentobox.bentobox.managers.IslandsManager#load()}.
|
||||
* @throws IOException
|
||||
* @throws IntrospectionException
|
||||
* @throws NoSuchMethodException
|
||||
* @throws ClassNotFoundException
|
||||
* @throws InvocationTargetException
|
||||
* @throws IllegalAccessException
|
||||
* @throws InstantiationException
|
||||
*/
|
||||
@Test
|
||||
public void testLoad() {
|
||||
//
|
||||
// im.load();
|
||||
public void testLoad() throws IOException, InstantiationException, IllegalAccessException,
|
||||
InvocationTargetException, ClassNotFoundException, NoSuchMethodException, IntrospectionException {
|
||||
when(island.getRange()).thenReturn(100);
|
||||
when(h.loadObjects()).thenReturn(List.of(island));
|
||||
try {
|
||||
im.load();
|
||||
} catch (IOException e) {
|
||||
assertEquals("Island distance mismatch!\n" + "World 'world' distance 25 != island range 100!\n"
|
||||
+ "Island ID in database is null.\n"
|
||||
+ "Island distance in config.yml cannot be changed mid-game! Fix config.yml or clean database.",
|
||||
e.getMessage());
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
@Test
|
||||
public void testLoadNoDistanceCheck() throws IOException, InstantiationException, IllegalAccessException,
|
||||
InvocationTargetException, ClassNotFoundException, NoSuchMethodException, IntrospectionException {
|
||||
settings.setOverrideSafetyCheck(true);
|
||||
when(island.getUniqueId()).thenReturn(UUID.randomUUID().toString());
|
||||
when(island.getRange()).thenReturn(100);
|
||||
when(h.loadObjects()).thenReturn(List.of(island));
|
||||
im.load();
|
||||
// No exception should be thrown
|
||||
}
|
||||
|
||||
/**
|
||||
* Test method for
|
||||
* {@link world.bentobox.bentobox.managers.IslandsManager#locationIsOnIsland(org.bukkit.entity.Player, org.bukkit.Location)}.
|
||||
|
Loading…
Reference in New Issue
Block a user