From 4bb8e20b59a4ef4e11be9f12432ab26bc163d306 Mon Sep 17 00:00:00 2001 From: nossr50 Date: Wed, 21 Aug 2019 04:57:02 -0700 Subject: [PATCH] 2.1.102 --- Changelog.txt | 2 +- pom.xml | 2 +- src/main/java/com/gmail/nossr50/util/skills/CombatUtils.java | 3 ++- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/Changelog.txt b/Changelog.txt index 205273299..a977652a2 100644 --- a/Changelog.txt +++ b/Changelog.txt @@ -1,6 +1,6 @@ Version 2.1.102 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 Fixed an exploit where chorus plants could be used to gain automatic XP diff --git a/pom.xml b/pom.xml index a00f76cfc..343064ada 100755 --- a/pom.xml +++ b/pom.xml @@ -2,7 +2,7 @@ 4.0.0 com.gmail.nossr50.mcMMO mcMMO - 2.1.102-SNAPSHOT + 2.1.102 mcMMO https://github.com/mcMMO-Dev/mcMMO diff --git a/src/main/java/com/gmail/nossr50/util/skills/CombatUtils.java b/src/main/java/com/gmail/nossr50/util/skills/CombatUtils.java index 4a525fdaf..f66467184 100644 --- a/src/main/java/com/gmail/nossr50/util/skills/CombatUtils.java +++ b/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; target.setMetadata(mcMMO.CUSTOM_DAMAGE_METAKEY, mcMMO.metadataValue); 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 target.setHealth(newHealth);