EpicKnarvik97/mcMMO
1
0
Fork 0
mirror of https://github.com/mcMMO-Dev/mcMMO.git synced 2025-11-04 11:03:43 +01:00
Code Issues Projects Releases Wiki Activity

Add ExploitFix.PreventPluginNPCInteraction to experience.yml

Browse Source 
Read the changelog for why
This commit is contained in:
nossr50
2020-12-28 12:58:03 -08:00
parent e8d51f42f3
commit a4ef322fa5
7 changed files with 26 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/main/java/com/gmail/nossr50/util/EventUtils.java
View File

@@ -1,6 +1,7 @@
package com.gmail.nossr50.util;
import com.gmail.nossr50.config.Config;
import com.gmail.nossr50.config.experience.ExperienceConfig;
import com.gmail.nossr50.datatypes.experience.XPGainReason;
import com.gmail.nossr50.datatypes.experience.XPGainSource;
import com.gmail.nossr50.datatypes.party.Party;

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

@@ -321,8 +321,10 @@ public final class CombatUtils {
EntityType entityType = painSource.getType();
if (target instanceof Player) {
if (Misc.isNPCEntityExcludingVillagers(target)) {
return;
if(ExperienceConfig.getInstance().isNPCInteractionPrevented()) {
if (Misc.isNPCEntityExcludingVillagers(target)) {
return;
}
}
Player player = (Player) target;
@@ -692,7 +694,7 @@ public final class CombatUtils {
break;
}
if (Misc.isNPCEntityExcludingVillagers(entity) || !(entity instanceof LivingEntity) || !shouldBeAffected(attacker, entity)) {
if ((ExperienceConfig.getInstance().isNPCInteractionPrevented() && Misc.isNPCEntityExcludingVillagers(entity)) || !(entity instanceof LivingEntity) || !shouldBeAffected(attacker, entity)) {
continue;
}