Upstream/DungeonsXL
1
0
Fork 0
mirror of https://github.com/DRE2N/DungeonsXL.git synced 2024-12-02 23:43:38 +01:00
Code Issues Projects Releases Wiki Activity

Move default protection of block-like entities to main config; resolves #798

Browse Source
This commit is contained in:
Tim Daniel Saukel 2021-04-07 19:46:10 +02:00
parent 2aff9529bc
commit 3be40cc20a
3 changed files with 8 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
api/src/main/java/de/erethon/dungeonsxl/api/dungeon/GameRule.java
View File

@ -16,7 +16,6 @@ package de.erethon.dungeonsxl.api.dungeon;
import de.erethon.caliburn.item.ExItem; import de.erethon.caliburn.item.ExItem;
import de.erethon.caliburn.mob.ExMob; import de.erethon.caliburn.mob.ExMob;
import de.erethon.caliburn.mob.VanillaMob;
import de.erethon.commons.chat.MessageUtil; import de.erethon.commons.chat.MessageUtil;
import de.erethon.commons.misc.EnumUtil; import de.erethon.commons.misc.EnumUtil;
import de.erethon.commons.misc.NumberUtil; import de.erethon.commons.misc.NumberUtil;
@ -27,7 +26,6 @@ import java.lang.reflect.Constructor;
import java.lang.reflect.Field; import java.lang.reflect.Field;
import java.lang.reflect.InvocationTargetException; import java.lang.reflect.InvocationTargetException;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Arrays;
import java.util.HashMap; import java.util.HashMap;
import java.util.HashSet; import java.util.HashSet;
import java.util.List; import java.util.List;
@ -117,22 +115,13 @@ public class GameRule<V> {
public static final GameRule<Map<ExItem, HashSet<ExItem>>> INTERACTION_BLACKLIST public static final GameRule<Map<ExItem, HashSet<ExItem>>> INTERACTION_BLACKLIST
= new MapGameRule<>("interactionBlacklist", null, ConfigReader.TOOL_BLOCK_MAP_READER, HashMap::new); = new MapGameRule<>("interactionBlacklist", null, ConfigReader.TOOL_BLOCK_MAP_READER, HashMap::new);
/** /**
* A list of all entity types that shall be protected from damage. If this is left out AND if breakBlocks is false, armor stands, paintings and item frames * A list of all entity types that shall be protected from damage.
* will be protected by default. If this is left out and if breakBlocks is true, nothing will be protected by default.
*/ */
public static final GameRule<Set<ExMob>> DAMAGE_PROTECTED_ENTITIES = new CollectionGameRule<>("damageProtectedEntities", new HashSet<>(Arrays.asList( public static final GameRule<Set<ExMob>> DAMAGE_PROTECTED_ENTITIES = new CollectionGameRule<>("damageProtectedEntities", null, ConfigReader.EX_MOB_SET_READER, HashSet::new);
VanillaMob.ARMOR_STAND,
VanillaMob.ITEM_FRAME,
VanillaMob.PAINTING
)), ConfigReader.EX_MOB_SET_READER, HashSet::new);
/** /**
* If this is left out AND if breakBlocks is false, armor stands and item frames will be protected by default. If this is left out and if breakBlocks is * A list of all entity types that shall be protected from interaction.
* true, nothing will be protected by default.
*/ */
public static final GameRule<Set<ExMob>> INTERACTION_PROTECTED_ENTITIES = new CollectionGameRule<>("interactionProtectedEntities", new HashSet<>(Arrays.asList( public static final GameRule<Set<ExMob>> INTERACTION_PROTECTED_ENTITIES = new CollectionGameRule<>("interactionProtectedEntities", null, ConfigReader.EX_MOB_SET_READER, HashSet::new);
VanillaMob.ARMOR_STAND,
VanillaMob.ITEM_FRAME
)), ConfigReader.EX_MOB_SET_READER, HashSet::new);
/** /**
* If blocks may be placed. * If blocks may be placed.
*/ */

13
api/src/main/java/de/erethon/dungeonsxl/api/dungeon/GameRuleContainer.java
View File

@ -15,7 +15,6 @@
package de.erethon.dungeonsxl.api.dungeon; package de.erethon.dungeonsxl.api.dungeon;
import java.util.HashMap; import java.util.HashMap;
import java.util.HashSet;
import java.util.Map; import java.util.Map;
/** /**
@ -102,18 +101,6 @@ public class GameRuleContainer {
*/ */
public void merge(GameRuleContainer subsidiary) { public void merge(GameRuleContainer subsidiary) {
subsidiary.rules.entrySet().forEach(e -> e.getKey().merge(this, subsidiary, this)); subsidiary.rules.entrySet().forEach(e -> e.getKey().merge(this, subsidiary, this));
// If we are using the last subsidiary rules (the default rules) and if blocks may be broken...
if (subsidiary != DEFAULT_VALUES || !getState(GameRule.BREAK_BLOCKS)) {
return;
}
// ...then it makes no sense to set *ProtectedEntities to default where several block-like entities (like paintings) are protected.
if (getState(GameRule.DAMAGE_PROTECTED_ENTITIES) == DEFAULT_VALUES.getState(GameRule.DAMAGE_PROTECTED_ENTITIES)) {
setState(GameRule.DAMAGE_PROTECTED_ENTITIES, new HashSet<>());
}
if (getState(GameRule.INTERACTION_PROTECTED_ENTITIES) == DEFAULT_VALUES.getState(GameRule.INTERACTION_PROTECTED_ENTITIES)) {
setState(GameRule.INTERACTION_PROTECTED_ENTITIES, new HashSet<>());
}
} }
@Override @Override

6
core/src/main/java/de/erethon/dungeonsxl/config/MainConfig.java
View File

@ -480,9 +480,11 @@ public class MainConfig extends DREConfig {
config.set("editPermissions", editPermissions); config.set("editPermissions", editPermissions);
} }
/* Default DDungeon Config */ /* Default Dungeon Config */
if (!config.contains("default")) { if (!config.contains("default")) {
config.createSection("default"); ConfigurationSection section = config.createSection("default");
section.set("damageProtectedEntities", Arrays.asList("ARMOR_STAND", "ITEM_FRAME", "PAINTING"));
section.set("interactionProtectedEntities", Arrays.asList("ARMOR_STAND", "ITEM_FRAME"));
} }
save(); save();