From ef43ba270057bfb052901e633934725f285a7f19 Mon Sep 17 00:00:00 2001 From: sk89q Date: Sun, 4 Nov 2012 11:05:21 -0800 Subject: [PATCH] player-spawn -> player-join --- src/main/java/com/sk89q/rulelists/KnownAttachment.java | 2 +- .../com/sk89q/worldguard/bukkit/WorldGuardPlayerListener.java | 2 +- src/main/resources/builtin_rules.yml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main/java/com/sk89q/rulelists/KnownAttachment.java b/src/main/java/com/sk89q/rulelists/KnownAttachment.java index d008275e..fc5700b9 100644 --- a/src/main/java/com/sk89q/rulelists/KnownAttachment.java +++ b/src/main/java/com/sk89q/rulelists/KnownAttachment.java @@ -34,7 +34,7 @@ public enum KnownAttachment { BLOCK_INTERACT("block-interact"), BLOCK_FADE("block-fade"), BLOCK_FORM("block-form"), - PLAYER_SPAWN("player-spawn"), + PLAYER_JOIN("player-join"), PLAYER_RESPAWN("player-respawn"), PLAYER_QUIT("player-quit"), ENTITY_EXPLODE("entity-explode"), diff --git a/src/main/java/com/sk89q/worldguard/bukkit/WorldGuardPlayerListener.java b/src/main/java/com/sk89q/worldguard/bukkit/WorldGuardPlayerListener.java index ffb83d50..cddae292 100644 --- a/src/main/java/com/sk89q/worldguard/bukkit/WorldGuardPlayerListener.java +++ b/src/main/java/com/sk89q/worldguard/bukkit/WorldGuardPlayerListener.java @@ -282,7 +282,7 @@ public void onPlayerJoin(PlayerJoinEvent event) { } // RuleLists - RuleSet rules = wcfg.getRuleList().get(KnownAttachment.PLAYER_SPAWN); + RuleSet rules = wcfg.getRuleList().get(KnownAttachment.PLAYER_JOIN); BukkitContext context = new BukkitContext(event); context.setSourceEntity(player); rules.process(context); diff --git a/src/main/resources/builtin_rules.yml b/src/main/resources/builtin_rules.yml index f862ae12..79f96b3d 100644 --- a/src/main/resources/builtin_rules.yml +++ b/src/main/resources/builtin_rules.yml @@ -1,6 +1,6 @@ - setting: [auto-invincible, auto-invincible-permission] rules: - - when: player-spawn + - when: player-join if: - ?has-permission: worldguard.auto-invincible then: