mirror of
https://github.com/mcMMO-Dev/mcMMO.git
synced 2024-11-25 14:46:46 +01:00
add ExploitFix.PreventArmorStandInteraction to prevent combat abilities going off on armor stands
This commit is contained in:
parent
7da8c8c83a
commit
b6697141f7
@ -1,3 +1,9 @@
|
|||||||
|
Version 2.1.232
|
||||||
|
Added new setting to experience.yml 'ExploitFix.PreventArmorStandInteraction' can be turned to false to enable mcMMO abilities on armor stands again
|
||||||
|
|
||||||
|
NOTES:
|
||||||
|
The new setting simply prevents mcMMO abilities from activating when attacking an armor stand, this prevents some exploits
|
||||||
|
|
||||||
Version 2.1.231
|
Version 2.1.231
|
||||||
Fixed a bug preventing parties from being made without passwords (Thanks Momshroom)
|
Fixed a bug preventing parties from being made without passwords (Thanks Momshroom)
|
||||||
Updated korean locale (thanks mangchi57)
|
Updated korean locale (thanks mangchi57)
|
||||||
|
2
pom.xml
2
pom.xml
@ -2,7 +2,7 @@
|
|||||||
<modelVersion>4.0.0</modelVersion>
|
<modelVersion>4.0.0</modelVersion>
|
||||||
<groupId>com.gmail.nossr50.mcMMO</groupId>
|
<groupId>com.gmail.nossr50.mcMMO</groupId>
|
||||||
<artifactId>mcMMO</artifactId>
|
<artifactId>mcMMO</artifactId>
|
||||||
<version>2.1.231</version>
|
<version>2.1.232-SNAPSHOT</version>
|
||||||
<name>mcMMO</name>
|
<name>mcMMO</name>
|
||||||
<url>https://github.com/mcMMO-Dev/mcMMO</url>
|
<url>https://github.com/mcMMO-Dev/mcMMO</url>
|
||||||
<scm>
|
<scm>
|
||||||
|
@ -177,6 +177,10 @@ public class ExperienceConfig extends BukkitConfig {
|
|||||||
return config.getBoolean("ExploitFix.PreventPluginNPCInteraction", true);
|
return config.getBoolean("ExploitFix.PreventPluginNPCInteraction", true);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public boolean isArmorStandInteractionPrevented() {
|
||||||
|
return config.getBoolean("ExploitFix.PreventArmorStandInteraction", true);
|
||||||
|
}
|
||||||
|
|
||||||
public boolean isFishingExploitingPrevented() {
|
public boolean isFishingExploitingPrevented() {
|
||||||
return config.getBoolean("ExploitFix.Fishing", true);
|
return config.getBoolean("ExploitFix.Fishing", true);
|
||||||
}
|
}
|
||||||
|
@ -300,6 +300,10 @@ public final class CombatUtils {
|
|||||||
Entity painSource = event.getDamager();
|
Entity painSource = event.getDamager();
|
||||||
EntityType entityType = painSource.getType();
|
EntityType entityType = painSource.getType();
|
||||||
|
|
||||||
|
if (target instanceof ArmorStand) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
if (target instanceof Player player) {
|
if (target instanceof Player player) {
|
||||||
if(ExperienceConfig.getInstance().isNPCInteractionPrevented()) {
|
if(ExperienceConfig.getInstance().isNPCInteractionPrevented()) {
|
||||||
if (Misc.isNPCEntityExcludingVillagers(target)) {
|
if (Misc.isNPCEntityExcludingVillagers(target)) {
|
||||||
|
@ -39,6 +39,7 @@ ExploitFix:
|
|||||||
TreeFellerReducedXP: true
|
TreeFellerReducedXP: true
|
||||||
PistonCheating: true
|
PistonCheating: true
|
||||||
SnowGolemExcavation: true
|
SnowGolemExcavation: true
|
||||||
|
PreventArmorStandInteraction: true
|
||||||
# This include NPCs from stuff like Citizens, this is not a setting for Vanilla Minecraft Villagers (Which can be considered NPCs)
|
# This include NPCs from stuff like Citizens, this is not a setting for Vanilla Minecraft Villagers (Which can be considered NPCs)
|
||||||
# mcMMO normally doesn't process attacks against an Entity if it is an NPC from another plugin
|
# mcMMO normally doesn't process attacks against an Entity if it is an NPC from another plugin
|
||||||
# Of course, mcMMO doesn't know for sure whether something is an NPC, it checks a few known things, see our source code to see how
|
# Of course, mcMMO doesn't know for sure whether something is an NPC, it checks a few known things, see our source code to see how
|
||||||
|
Loading…
Reference in New Issue
Block a user