nossr50 5 years ago
parent
commit
4bb8e20b59
3 changed files with 4 additions and 3 deletions
  1. 1 1
      Changelog.txt
  2. 1 1
      pom.xml
  3. 2 1
      src/main/java/com/gmail/nossr50/util/skills/CombatUtils.java

+ 1 - 1
Changelog.txt

@@ -1,6 +1,6 @@
 Version 2.1.102
 Version 2.1.102
     Scoreboards will now be removed from players who teleport to a blacklisted world
     Scoreboards will now be removed from players who teleport to a blacklisted world
-    Test
+    Fixed a bug where Rupture could trigger itself
 
 
 Version 2.1.101
 Version 2.1.101
     Fixed an exploit where chorus plants could be used to gain automatic XP
     Fixed an exploit where chorus plants could be used to gain automatic XP

+ 1 - 1
pom.xml

@@ -2,7 +2,7 @@
     <modelVersion>4.0.0</modelVersion>
     <modelVersion>4.0.0</modelVersion>
     <groupId>com.gmail.nossr50.mcMMO</groupId>
     <groupId>com.gmail.nossr50.mcMMO</groupId>
     <artifactId>mcMMO</artifactId>
     <artifactId>mcMMO</artifactId>
-    <version>2.1.102-SNAPSHOT</version>
+    <version>2.1.102</version>
     <name>mcMMO</name>
     <name>mcMMO</name>
     <url>https://github.com/mcMMO-Dev/mcMMO</url>
     <url>https://github.com/mcMMO-Dev/mcMMO</url>
     <scm>
     <scm>

+ 2 - 1
src/main/java/com/gmail/nossr50/util/skills/CombatUtils.java

@@ -543,7 +543,8 @@ public final class CombatUtils {
             boolean wasMetaSet = target.getMetadata(mcMMO.CUSTOM_DAMAGE_METAKEY).size() != 0;
             boolean wasMetaSet = target.getMetadata(mcMMO.CUSTOM_DAMAGE_METAKEY).size() != 0;
             target.setMetadata(mcMMO.CUSTOM_DAMAGE_METAKEY, mcMMO.metadataValue);
             target.setMetadata(mcMMO.CUSTOM_DAMAGE_METAKEY, mcMMO.metadataValue);
             target.damage(9999, attacker);
             target.damage(9999, attacker);
-            if (!wasMetaSet) target.removeMetadata(mcMMO.CUSTOM_DAMAGE_METAKEY, mcMMO.p);
+            if (!wasMetaSet)
+                target.removeMetadata(mcMMO.CUSTOM_DAMAGE_METAKEY, mcMMO.p);
         }
         }
         else
         else
             target.setHealth(newHealth);
             target.setHealth(newHealth);