Compatibility with CompatNoCheatPlus

Fixed issue that shows "You must wait 0 seconds before..." when wait
time is lesser than 1 second (ex. 0,25s).
This commit is contained in:
Boos 2012-08-17 16:55:24 +02:00
parent 41be44e752
commit c3ad44e645
3 changed files with 37 additions and 12 deletions

View File

@ -10,6 +10,7 @@ import org.bukkit.event.EventPriority;
import org.bukkit.event.Listener;
import org.bukkit.event.entity.EntityDamageEvent;
import org.bukkit.event.entity.PlayerDeathEvent;
import org.bukkit.event.player.AsyncPlayerChatEvent;
import org.bukkit.event.player.PlayerCommandPreprocessEvent;
import org.bukkit.event.player.PlayerGameModeChangeEvent;
import org.bukkit.event.player.PlayerInteractEvent;
@ -29,7 +30,7 @@ public class boosCoolDownListener<a> implements Listener {
plugin = instance;
}
@EventHandler(priority = EventPriority.LOWEST)
@EventHandler(priority = EventPriority.LOW)
public void onPlayerCommandPreprocess(PlayerCommandPreprocessEvent event) {
if (event.isCancelled()) {
return;
@ -394,7 +395,7 @@ public class boosCoolDownListener<a> implements Listener {
if (boosPriceManager.payForCommand(player, pre, price, name)) {
return;
} else {
//boosPriceManager.payForCommand(player, pre, price, name);
// boosPriceManager.payForCommand(player, pre, price, name);
boosCoolDownManager.cancelCooldown(player, pre);
event.setCancelled(true);
return;
@ -709,30 +710,50 @@ public class boosCoolDownListener<a> implements Listener {
&& boosCoolDown.getPermissions().has(player,
"booscooldowns.clear.cooldowns.death")) {
if (boosConfigManager.getCleanCooldownsOnDeath()) {
boosCoolDownManager.clearSomething("cooldown",
player.getName().toLowerCase());
boosCoolDownManager.clearSomething("cooldown", player
.getName().toLowerCase());
}
}
if (player != null
&& boosCoolDown.getPermissions().has(player,
"booscooldowns.clear.uses.death")) {
if (boosConfigManager.getCleanUsesOnDeath()) {
boosCoolDownManager.clearSomething("uses",
player.getName().toLowerCase());
boosCoolDownManager.clearSomething("uses", player
.getName().toLowerCase());
}
}
} else {
if (player != null) {
if (boosConfigManager.getCleanCooldownsOnDeath()) {
boosCoolDownManager.clearSomething("cooldown",
player.getName().toLowerCase());
boosCoolDownManager.clearSomething("cooldown", player
.getName().toLowerCase());
}
if (boosConfigManager.getCleanUsesOnDeath()) {
boosCoolDownManager.clearSomething("uses",
player.getName().toLowerCase());
boosCoolDownManager.clearSomething("uses", player
.getName().toLowerCase());
}
}
}
}
}
@EventHandler(priority = EventPriority.LOW)
public void onPlayerChat(AsyncPlayerChatEvent event) {
String chatMessage = event.getMessage();
if (chatMessage.startsWith("!")) {
String temp = "globalchat";
if (!boosCoolDownManager.checkCoolDownOK(event.getPlayer(), temp,
chatMessage)) {
event.setCancelled(true);
return;
} else {
if (boosCoolDownManager.coolDown(event.getPlayer(), temp)) {
event.setCancelled(true);
return;
} else {
return;
}
}
}
}
}

View File

@ -218,8 +218,12 @@ public class boosCoolDownManager {
msg = msg.replaceAll("&unit&",
boosConfigManager.getUnitHoursMessage());
} else {
String secs = Long.toString(waitSeconds);
if (secs.equals("0")){
secs = "1";
}
msg = msg.replaceAll("&seconds&",
Long.toString(waitSeconds));
secs);
msg = msg.replaceAll("&unit&",
boosConfigManager.getUnitSecondsMessage());
}

View File

@ -1,6 +1,6 @@
name: boosCooldown
main: cz.boosik.boosCooldown.boosCoolDown
version: 2.9.0
version: 2.9.2
author: boosik
softdepend: [Vault,PermissionsEX]
description: >