EpicKnarvik97/mcMMO
1
0
Fork 0
mirror of https://github.com/mcMMO-Dev/mcMMO.git synced 2025-07-29 02:25:27 +02:00
Code Issues Projects Releases Wiki Activity

RepairManager: Fix unsafe enchantments being stripped, CombatUtils: Use instanceof for IronGolem (#5192)

Browse Source 
* RepairManager: Fix unsafe enchantments being stripped

* CombatUtils: Use instanceof for IronGolem check to avoid cast exceptions for pets/npcs/...

---------

Co-authored-by: Dieu <info@l4b.org>
This commit is contained in:
Techirion
2025-07-09 23:23:34 +02:00
committed by GitHub
parent e6c62beed9
commit c377544fa2
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/com/gmail/nossr50/skills/repair/RepairManager.java
View File

@@ -411,7 +411,7 @@ public class RepairManager extends SkillManager {
if (enchantLevel > enchant.getKey().getMaxLevel()) {
enchantLevel = enchant.getKey().getMaxLevel();
item.addEnchantment(enchant.getKey(), enchantLevel);
item.addUnsafeEnchantment(enchant.getKey(), enchantLevel);
}
}

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

@@ -961,8 +961,8 @@ public final class CombatUtils {
EntityType type = target.getType();
if (ExperienceConfig.getInstance().hasCombatXP(type)) {
if (type == EntityType.IRON_GOLEM) {
if (!((IronGolem) target).isPlayerCreated()) {
if (type == EntityType.IRON_GOLEM && target instanceof IronGolem ironGolem) {
if (!ironGolem.isPlayerCreated()) {
baseXP = ExperienceConfig.getInstance().getCombatXP(type);
}
} else {