Upstream/mcMMO
1
0
Fork 0
mirror of https://github.com/mcMMO-Dev/mcMMO.git synced 2024-12-26 02:28:03 +01:00
Code Issues Projects Releases Wiki Activity

Fix /xprate not properly sending "Event started" messages. Fixes #624

Browse Source
This commit is contained in:
GJ 2013-02-04 08:47:54 -05:00
parent 284bab397a
commit 458f7f5f5b
2 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/main/java/com/gmail/nossr50/commands/admin/XprateCommand.java
View File

@ -24,8 +24,6 @@ public class XprateCommand implements CommandExecutor {
return true; return true;
} }
boolean xpEventEnabled = mcMMO.p.isXPEventEnabled();
switch (args.length) { switch (args.length) {
case 1: case 1:
if (args[0].equalsIgnoreCase("reset")) { if (args[0].equalsIgnoreCase("reset")) {
@ -33,12 +31,12 @@ public class XprateCommand implements CommandExecutor {
return true; return true;
} }
if (xpEventEnabled) { if (mcMMO.p.isXPEventEnabled()) {
for (Player x : mcMMO.p.getServer().getOnlinePlayers()) { for (Player x : mcMMO.p.getServer().getOnlinePlayers()) {
x.sendMessage(LocaleLoader.getString("Commands.xprate.over")); x.sendMessage(LocaleLoader.getString("Commands.xprate.over"));
} }
mcMMO.p.setXPEventEnabled(!xpEventEnabled); mcMMO.p.toggleXpEventEnabled();
Config.getInstance().setExperienceGainsGlobalMultiplier(originalRate); Config.getInstance().setExperienceGainsGlobalMultiplier(originalRate);
} }
else { else {
@ -69,7 +67,7 @@ public class XprateCommand implements CommandExecutor {
int newRate = Misc.getInt(args[0]); int newRate = Misc.getInt(args[0]);
Config.getInstance().setExperienceGainsGlobalMultiplier(newRate); Config.getInstance().setExperienceGainsGlobalMultiplier(newRate);
if (xpEventEnabled) { if (mcMMO.p.isXPEventEnabled()) {
for (Player x : mcMMO.p.getServer().getOnlinePlayers()) { for (Player x : mcMMO.p.getServer().getOnlinePlayers()) {
x.sendMessage(LocaleLoader.getString("Commands.xprate.started.0")); x.sendMessage(LocaleLoader.getString("Commands.xprate.started.0"));
x.sendMessage(LocaleLoader.getString("Commands.xprate.started.1", newRate)); x.sendMessage(LocaleLoader.getString("Commands.xprate.started.1", newRate));

4
src/main/java/com/gmail/nossr50/mcMMO.java
View File

@ -540,5 +540,9 @@ public class mcMMO extends JavaPlugin {
public void setXPEventEnabled(boolean enabled) { public void setXPEventEnabled(boolean enabled) {
this.xpEventEnabled = enabled; this.xpEventEnabled = enabled;
} }
public void toggleXpEventEnabled() {
xpEventEnabled = !xpEventEnabled;
}
} }