EpicKnarvik97/mcMMO
1
0
Fork 0
mirror of https://github.com/mcMMO-Dev/mcMMO.git synced 2025-12-17 14:28:46 +01:00
Code Issues Projects Releases Wiki Activity

1.21.9 support for treasures.yml, experience.yml, fishing_treasures.yml, and settings for mannequins and a fix for armor stands

Browse Source
This commit is contained in:
nossr50
2025-10-05 12:27:20 -07:00
parent c958a86aa3
commit 07d18e2eba
8 changed files with 77 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -58,7 +58,7 @@ import org.jetbrains.annotations.Nullable;
public final class CombatUtils {
private static final ThreadLocal<Boolean> IN_MCMO_DAMAGE
private static final ThreadLocal<Boolean> IN_MCMMO_DAMAGE
= ThreadLocal.withInitial(() -> false);
@@ -75,14 +75,14 @@ public final class CombatUtils {
*/
public static void safeDealDamage(@NotNull LivingEntity target, double amount,
@Nullable Entity attacker) {
boolean prev = IN_MCMO_DAMAGE.get();
boolean prev = IN_MCMMO_DAMAGE.get();
if (prev || target.isDead()) {
return;
}
try {
IN_MCMO_DAMAGE.set(true);
IN_MCMMO_DAMAGE.set(true);
if (!hasIgnoreDamageMetadata(target)) {
applyIgnoreDamageMetadata(target);
}
@@ -93,7 +93,7 @@ public final class CombatUtils {
target.damage(amount);
}
} finally {
IN_MCMO_DAMAGE.set(false);
IN_MCMMO_DAMAGE.set(false);
if (hasIgnoreDamageMetadata(target)) {
removeIgnoreDamageMetadata(target);
}