used commands are now only logged to users.yml, if limits are set on

them
This commit is contained in:
Boosik 2013-03-29 18:03:27 +01:00
parent 76d70593d0
commit 3646f78ad3
9 changed files with 25 additions and 21 deletions

View File

@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry kind="src" path="src"/>
<classpathentry kind="lib" path="D:/Games/Minecraft/server/bukkit-1.4.7-R1.0.jar"/>
<classpathentry kind="lib" path="D:/Downloads/df/Vault.jar"/>
<classpathentry kind="lib" path="C:/Users/Jakub/git/bukkit-1.5.1-R0.1-20130328.013018-15.jar"/>
<classpathentry kind="lib" path="D:/Games/Minecraft/server/plugins/Vault.jar"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/jre6"/>
<classpathentry kind="output" path="bin"/>
</classpath>

View File

@ -1,6 +1,6 @@
name: boosCooldowns
main: cz.boosik.boosCooldown.boosCoolDown
version: 3.4.1
version: 3.4.3
authors: [LordBoos (ingame name boosik)]
softdepend: [Vault]
description: >

View File

@ -122,7 +122,7 @@ public class boosCoolDownListener<a> implements Listener {
return on;
}
@EventHandler(priority = EventPriority.LOW)
@EventHandler(priority = EventPriority.LOWEST)
private void onPlayerCommandPreprocess(PlayerCommandPreprocessEvent event) {
if (event.isCancelled()) {
return;
@ -396,7 +396,6 @@ public class boosCoolDownListener<a> implements Listener {
if (boosCoolDownManager.checkCoolDownOK(player, pre, message)) {
boosWarmUpManager.startWarmUp(this.plugin, player, pre,
message, warmUpSeconds);
boosWarmUpManager.applyPotionEffect(player, pre, message, warmUpSeconds);
event.setCancelled(true);
return;
} else {

View File

@ -363,20 +363,22 @@ public class boosCoolDownManager {
static void setUses(Player player, String pre, String message) {
if (boosConfigManager.getLimitsEnabled()) {
int pre2 = pre.toLowerCase().hashCode();
int message2 = message.toLowerCase().hashCode();
int uses = getUses(player, pre, message);
uses = uses + 1;
try {
confusers.set("users."
+ player.getName().toLowerCase().hashCode() + ".uses."
+ pre2 + message2, uses);
} catch (IllegalArgumentException e) {
boosCoolDown.log.warning("Player " + player.getName()
+ " used empty command and caused this error!");
if (boosConfigManager.getLimits(player).contains(pre)) {
int pre2 = pre.toLowerCase().hashCode();
int message2 = message.toLowerCase().hashCode();
int uses = getUses(player, pre, message);
uses = uses + 1;
try {
confusers.set("users."
+ player.getName().toLowerCase().hashCode()
+ ".uses." + pre2 + message2, uses);
} catch (IllegalArgumentException e) {
boosCoolDown.log.warning("Player " + player.getName()
+ " used empty command and caused this error!");
}
} else {
return;
}
} else {
return;
}
}

View File

@ -92,6 +92,7 @@ public class boosWarmUpManager {
scheduler, player, pre, message);
playercommands.put(player.getName() + "@" + pre, scheduleMe);
scheduler.schedule(scheduleMe, warmUpSeconds * 1000);
applyPotionEffect(player, pre, message, warmUpSeconds);
} else {
String msg = boosConfigManager.getWarmUpAlreadyStartedMessage();
msg = msg.replaceAll("&command&", pre);
@ -101,9 +102,11 @@ public class boosWarmUpManager {
public static void applyPotionEffect(Player player, String pre,
String message, int warmUpSeconds) {
String[] potion = boosConfigManager.getPotionEffect(pre).split("@");
String potionTemp = boosConfigManager.getPotionEffect(pre);
if (potionTemp == null)
return;
String[] potion = potionTemp.split("@");
PotionEffectType effect = PotionEffectType.getByName(potion[0]);
player.addPotionEffect(effect.createEffect(warmUpSeconds*40, Integer.parseInt(potion[1])-1), true);
}
}

View File

@ -1,6 +1,6 @@
name: boosCooldowns
main: cz.boosik.boosCooldown.boosCoolDown
version: 3.4.1
version: 3.4.3
authors: [LordBoos (ingame name boosik)]
softdepend: [Vault]
description: >