Minor fixes

DenizenScript · Mar 10, 2013 · e0e6183 · e0e6183
1 parent bc60cf2
commit e0e6183
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 12 deletions.
diff --git a/pom.xml b/pom.xml
@@ -28,8 +28,8 @@
                 <artifactId>maven-compiler-plugin</artifactId>
                 <version>2.3.2</version>
                 <configuration>
-                    <source>1.7</source>
-                    <target>1.7</target>
+                    <source>1.6</source>
+                    <target>1.6</target>
                 </configuration>
             </plugin>
             <plugin>
@@ -77,13 +77,13 @@
 		</repository>
     </repositories>
     <dependencies>
-        <dependency>
+		<dependency>
             <groupId>org.bukkit</groupId>
             <artifactId>bukkit</artifactId>
             <version>LATEST</version>
             <type>jar</type>
             <scope>compile</scope>
-        </dependency>
+		</dependency>
 		<dependency> 
 			<groupId>net.aufdemrand</groupId>
 			<artifactId>denizen</artifactId>

diff --git a/src/main/java/net/gnomeffinway/depenizen/battlenight/BattleNightTags.java b/src/main/java/net/gnomeffinway/depenizen/battlenight/BattleNightTags.java
@@ -41,11 +41,19 @@ public void battlenightTags(ReplaceableTagEvent event) {
             }
         } else if (event.matches("BATTLE")) {
             if (type.equals("ARENA")) {
-                event.setReplaced(String.valueOf(BattleNight.instance.getAPI().getBattle().getArena().getName()));
+                if(BattleNight.instance.getAPI().getBattle().isInProgress()) {
+                    event.setReplaced(String.valueOf(BattleNight.instance.getAPI().getBattle().getArena().getName()));
+                } else {
+                    event.setReplaced("none");
+                }
             } else if (type.equals("INPROGRESS")) {
                 event.setReplaced(String.valueOf(BattleNight.instance.getAPI().getBattle().isInProgress()));
             } else if (type.equals("TIMEREMAINING")) {
-                event.setReplaced(String.valueOf(BattleNight.instance.getAPI().getBattle().getTimer().getTimeRemaining()));
+                if(BattleNight.instance.getAPI().getBattle().isInProgress()) {
+                    event.setReplaced(String.valueOf(BattleNight.instance.getAPI().getBattle().getTimer().getTimeRemaining()));
+                } else {
+                    event.setReplaced("none");
+                }
             }
         }
 

diff --git a/src/main/java/net/gnomeffinway/depenizen/factions/FactionsTags.java b/src/main/java/net/gnomeffinway/depenizen/factions/FactionsTags.java
@@ -34,7 +34,7 @@ public void factionsTags(ReplaceableTagEvent event) {
         if(event.matches("PLAYER")) {
             if (type.equals("FACTION")) {
                 if(FPlayers.i.get(p).hasFaction()) {
-                    if(subType.equals("ROLE") || subType.equals("RANK")) {
+                    if(subType.equals("ROLE")) {
                         if(FPlayers.i.get(p).getRole() == null)
                             event.setReplaced(String.valueOf(FPlayers.i.get(p).getRole()));
                         else
@@ -45,14 +45,13 @@ public void factionsTags(ReplaceableTagEvent event) {
                         else
                             event.setReplaced("none");
                     } else {
-                        if(FPlayers.i.get(p).hasFaction()) 
                             event.setReplaced(String.valueOf(FPlayers.i.get(p).getFaction().getTag()));
-                        else
-                            event.setReplaced("none");
                     }
                 } else {
                     if(subType.equals("POWER")) {
                         event.setReplaced(String.valueOf(FPlayers.i.get(p).getPower()));
+                    } else {
+                    event.setReplaced("none");
                     }
                 }
             }

diff --git a/src/main/java/net/gnomeffinway/depenizen/mcmmo/McMMOTags.java b/src/main/java/net/gnomeffinway/depenizen/mcmmo/McMMOTags.java
@@ -22,6 +22,7 @@ public McMMOTags(Depenizen depenizen) {
     public void mcmmoTags(ReplaceableTagEvent event) {        
 
         Player p = event.getPlayer();
+        String nameContext = event.getNameContext() != null ? event.getNameContext().toUpperCase() : "";
         String type = event.getType() != null ? event.getType().toUpperCase() : "";
         String typeContext = event.getTypeContext() != null ? event.getTypeContext().toUpperCase() : "";
         String subType = event.getSubType() != null ? event.getSubType().toUpperCase() : "";
@@ -31,7 +32,11 @@ public void mcmmoTags(ReplaceableTagEvent event) {
         if(event.matches("PLAYER")) {
             if (type.equals("MCMMO")) {
                 if (subType.equals("LEVEL")) {
-                    event.setReplaced(String.valueOf(ExperienceAPI.getLevel(p, subTypeContext)));
+                    if(subTypeContext == "") {
+                        event.setReplaced(String.valueOf(ExperienceAPI.getPowerLevel(p)));
+                    } else {
+                        event.setReplaced(String.valueOf(ExperienceAPI.getLevel(p, subTypeContext)));
+                    }
                 } else if (subType.equals("PARTY")) {
                     if(PartyAPI.inParty(p)) {
                         event.setReplaced(String.valueOf(PartyAPI.getPartyName(p)));
@@ -54,7 +59,7 @@ public void mcmmoTags(ReplaceableTagEvent event) {
             }
         } else if (event.matches("PARTY")) {
             if (type.equals("LEADER")) {
-                event.setReplaced(String.valueOf(PartyAPI.getPartyLeader(typeContext)));
+                event.setReplaced(String.valueOf(PartyAPI.getPartyLeader(nameContext)));
             }
         }