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

We should ALWAYS inform other plugins of what we're doing.

Browse Source
This commit is contained in:
GJ 2013-10-23 10:19:22 -04:00 committed by TfT_02
parent 20967bea92
commit a99293aa48
3 changed files with 6 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/main/java/com/gmail/nossr50/config/Config.java
View File

@ -205,7 +205,6 @@ public class Config extends AutoUpdateConfigLoader {
public boolean getStatsTrackingEnabled() { return config.getBoolean("General.Stats_Tracking", true); } public boolean getStatsTrackingEnabled() { return config.getBoolean("General.Stats_Tracking", true); }
public boolean getUpdateCheckEnabled() { return config.getBoolean("General.Update_Check", true); } public boolean getUpdateCheckEnabled() { return config.getBoolean("General.Update_Check", true); }
public boolean getPreferBeta() { return config.getBoolean("General.Prefer_Beta", false); } public boolean getPreferBeta() { return config.getBoolean("General.Prefer_Beta", false); }
public boolean getEventCallbackEnabled() { return config.getBoolean("General.Event_Callback", true); }
public boolean getVerboseLoggingEnabled() { return config.getBoolean("General.Verbose_Logging", false); } public boolean getVerboseLoggingEnabled() { return config.getBoolean("General.Verbose_Logging", false); }
public boolean getConfigOverwriteEnabled() { return config.getBoolean("General.Config_Update_Overwrite", true); } public boolean getConfigOverwriteEnabled() { return config.getBoolean("General.Config_Update_Overwrite", true); }

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

@ -564,17 +564,13 @@ public final class CombatUtils {
} }
public static double callFakeDamageEvent(Entity attacker, Entity target, DamageCause cause, double damage) { public static double callFakeDamageEvent(Entity attacker, Entity target, DamageCause cause, double damage) {
if (Config.getInstance().getEventCallbackEnabled()) { EntityDamageEvent damageEvent = attacker == null ? new FakeEntityDamageEvent(target, cause, damage) : new FakeEntityDamageByEntityEvent(attacker, target, cause, damage);
EntityDamageEvent damageEvent = attacker == null ? new FakeEntityDamageEvent(target, cause, damage) : new FakeEntityDamageByEntityEvent(attacker, target, cause, damage); mcMMO.p.getServer().getPluginManager().callEvent(damageEvent);
mcMMO.p.getServer().getPluginManager().callEvent(damageEvent);
if (damageEvent.isCancelled()) { if (damageEvent.isCancelled()) {
return 0; return 0;
}
damage = damageEvent.getDamage();
} }
return damage; return damageEvent.getDamage();
} }
} }

4
src/main/resources/config.yml
View File

@ -17,8 +17,6 @@ General:
# Allow mcMMO to check if a new version is available # Allow mcMMO to check if a new version is available
Update_Check: true Update_Check: true
Prefer_Beta: false Prefer_Beta: false
# Allow mcMMO to inform other plugins of damage being dealt
Event_Callback: true
Power_Level_Cap: 0 Power_Level_Cap: 0
# Should mcMMO print out debug messages? # Should mcMMO print out debug messages?
Verbose_Logging: false Verbose_Logging: false
@ -402,4 +400,4 @@ Particles:
# These settings determine if fireworks should get launched when a player levels-up, # These settings determine if fireworks should get launched when a player levels-up,
# this will happen by default for every 100 levels. # this will happen by default for every 100 levels.
LevelUp_Enabled: true LevelUp_Enabled: true
LevelUp_Tier: 100 LevelUp_Tier: 100