EpicKnarvik97/mcMMO
EpicKnarvik97/mcMMO
1
0
Fork 0
mirror of https://github.com/mcMMO-Dev/mcMMO.git synced 2024-11-22 05:06:45 +01:00
Code Issues Projects Releases Wiki Activity

2.1.102

Browse Source
This commit is contained in:
nossr50 2019-08-21 04:57:02 -07:00
parent e8165321e1
commit 4bb8e20b59
3 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Changelog.txt
View File

@ -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

2
pom.xml
View File

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

3
src/main/java/com/gmail/nossr50/util/skills/CombatUtils.java
View File

@ -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);