Upstream/WorldGuard
1
0
Fork 0
mirror of https://github.com/EngineHub/WorldGuard.git synced 2025-03-13 15:20:05 +01:00
Code Issues Projects Releases Wiki Activity

Standardized default resolver values.

Browse Source
This commit is contained in:
sk89q 2012-11-04 12:33:35 -08:00
parent 35628d09be
commit 69940f2fac
7 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/com/sk89q/worldguard/bukkit/definitions/BlockCriteriaLoader.java
View File

@ -49,7 +49,7 @@ public BlockCriteriaLoader(RuleListsManager manager) {
public BlockCriteria read(ConfigurationNode node)
throws DefinitionException {
BlockResolver resolver = manager.getResolvers()
.get(BlockResolver.class, node.getString("block", "target"));
.get(BlockResolver.class, node.getString("block", BlockResolver.DEFAULT));
// Load patterns
List<MaterialPattern> patterns = node.contains(INLINE) ?

2
src/main/java/com/sk89q/worldguard/bukkit/definitions/EntityCriteriaLoader.java
View File

@ -54,7 +54,7 @@ public EntityCriteriaLoader(RuleListsManager manager) {
@Override
public EntityCriteria read(ConfigurationNode node) throws DefinitionException {
EntityResolver entityResolver = manager.getResolvers()
.get(EntityResolver.class, node.getString("entity", "source"));
.get(EntityResolver.class, node.getString("entity", EntityResolver.DEFAULT));
Set<EntityType> types = node.contains(INLINE) ?
node.setOf(INLINE, typeLoader) :

2
src/main/java/com/sk89q/worldguard/bukkit/definitions/PermissionCriteriaLoader.java
View File

@ -42,7 +42,7 @@ public PermissionCriteriaLoader(WorldGuardPlugin wg, RuleListsManager manager) {
@Override
public PermissionCriteria read(ConfigurationNode node) throws DefinitionException {
EntityResolver entityResolver = manager.getResolvers()
.get(EntityResolver.class, node.getString("entity", "source"));
.get(EntityResolver.class, node.getString("entity", EntityResolver.DEFAULT));
String permission = node.contains(INLINE) ?
node.getString(INLINE, "") :

2
src/main/java/com/sk89q/worldguard/bukkit/definitions/SetBlockActionLoader.java
View File

@ -43,7 +43,7 @@ public SetBlockActionLoader(RuleListsManager manager) {
@Override
public SetBlockAction read(ConfigurationNode node) throws DefinitionException {
BlockResolver resolver = manager.getResolvers()
.get(BlockResolver.class, node.getString("block", "target"));
.get(BlockResolver.class, node.getString("block", BlockResolver.DEFAULT));
// Load patterns
MaterialPattern material = node.contains(INLINE) ?

2
src/main/java/com/sk89q/worldguard/bukkit/definitions/TellActionLoader.java
View File

@ -39,7 +39,7 @@ public TellActionLoader(RuleListsManager manager) {
@Override
public TellAction read(ConfigurationNode node) throws DefinitionException {
EntityResolver entityResolver = manager.getResolvers()
.get(EntityResolver.class, node.getString("entity", "source"));
.get(EntityResolver.class, node.getString("entity", EntityResolver.DEFAULT));
String message = node.contains(INLINE) ? node.getString(INLINE) : node.getString("message");

2
src/main/java/com/sk89q/worldguard/bukkit/definitions/UpdateEntityActionLoader.java
View File

@ -40,7 +40,7 @@ public UpdateEntityActionLoader(WorldGuardPlugin wg, RuleListsManager manager) {
@Override
public UpdateEntityAction read(ConfigurationNode node) throws DefinitionException {
EntityResolver entityResolver = manager.getResolvers()
.get(EntityResolver.class, node.getString("entity", "source"));
.get(EntityResolver.class, node.getString("entity", EntityResolver.DEFAULT));
UpdateEntityAction criteria = new UpdateEntityAction(wg, entityResolver);

4
src/main/java/com/sk89q/worldguard/bukkit/definitions/UpdateItemActionLoader.java
View File

@ -38,9 +38,9 @@ public UpdateItemActionLoader(RuleListsManager manager) {
@Override
public UpdateItemAction read(ConfigurationNode node) throws DefinitionException {
ItemStackSlotResolver resolver = manager.getResolvers()
.get(ItemStackSlotResolver.class, node.getString("item", "held"));
.get(ItemStackSlotResolver.class, node.getString("item", ItemStackSlotResolver.DEFAULT));
EntityResolver entityResolver = manager.getResolvers()
.get(EntityResolver.class, node.getString("entity", "source"));
.get(EntityResolver.class, node.getString("entity", EntityResolver.DEFAULT));
boolean destroy = node.getBoolean("destroy", false);
short newData = (short) node.getInt("set-data", -1);