Upstream/boosCooldowns
1
0
Fork 0
mirror of https://github.com/LordBoos/boosCooldowns.git synced 2024-11-23 02:55:11 +01:00
Code Issues Projects Releases Wiki Activity

changed interact blocking to only block containers

Browse Source
This commit is contained in:
Boos 2012-03-22 12:45:48 +01:00
parent 811e6cd3a4
commit 07c9a7c677
1 changed files with 58 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

71
src/cz/boosik/boosCooldown/boosCoolDownListener.java
View File

@ -287,7 +287,8 @@ public class boosCoolDownListener implements Listener {
boosPriceManager
.payForCommand(player, pre, message);
if (boosConfigManager.getCommandLogging()) {
boosCoolDown.commandLogger(player.getName(), message);
boosCoolDown.commandLogger(player.getName(),
message);
}
} else {
boosPriceManager
@ -306,8 +307,8 @@ public class boosCoolDownListener implements Listener {
boosChat.sendMessageToPlayer(player, msg);
return false;
}
if(!event.isCancelled() && boosConfigManager.getCommandLogging()){
boosCoolDown.commandLogger(player.getName(), pre);
if (!event.isCancelled() && boosConfigManager.getCommandLogging()) {
boosCoolDown.commandLogger(player.getName(), pre);
}
return false;
}
@ -497,15 +498,15 @@ public class boosCoolDownListener implements Listener {
}
}
}
@EventHandler(priority = EventPriority.NORMAL)
public void onPlayerInteract(PlayerInteractEvent event) {
if (!boosConfigManager.getBlockInteractDuringWarmup())
return;
if (event.isCancelled())
return;
Entity entity = event.getPlayer();
if (entity != null && entity instanceof Player) {
Player player = (Player) entity;
@ -514,25 +515,69 @@ public class boosCoolDownListener implements Listener {
&& !boosCoolDown.getPermissions().has(player,
"booscooldowns.dontblock.interact")) {
if (boosWarmUpManager.hasWarmUps(player)) {
boosChat.sendMessageToPlayer(player, boosConfigManager
.getInteractBlockedMessage());
event.setCancelled(true);
if (event.getClickedBlock().getType().equals("CHEST")
|| event.getClickedBlock().getType()
.equals("FURNACE")
|| event.getClickedBlock().getType()
.equals("BURNING_FURNACE")
|| event.getClickedBlock().getType()
.equals("WORKBENCH")
|| event.getClickedBlock().getType()
.equals("DISPENSER")
|| event.getClickedBlock().getType()
.equals("JUKEBOX")
|| event.getClickedBlock().getType()
.equals("LOCKED_CHEST")
|| event.getClickedBlock().getType()
.equals("ENCHANTMENT_TABLE")
|| event.getClickedBlock().getType()
.equals("BREWING_STAND")
|| event.getClickedBlock().getType()
.equals("CAULDRON")
|| event.getClickedBlock().getType()
.equals("STORAGE_MINECART")){
event.setCancelled(true);
boosChat.sendMessageToPlayer(player,
boosConfigManager.getInteractBlockedMessage());
}
}
}
} else {
if (player != null) {
if (boosWarmUpManager.hasWarmUps(player)) {
boosChat.sendMessageToPlayer(player, boosConfigManager
.getInteractBlockedMessage());
event.setCancelled(true);
if (event.getClickedBlock().getType().equals("CHEST")
|| event.getClickedBlock().getType()
.equals("FURNACE")
|| event.getClickedBlock().getType()
.equals("BURNING_FURNACE")
|| event.getClickedBlock().getType()
.equals("WORKBENCH")
|| event.getClickedBlock().getType()
.equals("DISPENSER")
|| event.getClickedBlock().getType()
.equals("JUKEBOX")
|| event.getClickedBlock().getType()
.equals("LOCKED_CHEST")
|| event.getClickedBlock().getType()
.equals("ENCHANTMENT_TABLE")
|| event.getClickedBlock().getType()
.equals("BREWING_STAND")
|| event.getClickedBlock().getType()
.equals("CAULDRON")
|| event.getClickedBlock().getType()
.equals("STORAGE_MINECART")){
event.setCancelled(true);
boosChat.sendMessageToPlayer(player,
boosConfigManager.getInteractBlockedMessage());
}
}
}
}
}
}
@EventHandler(priority = EventPriority.NORMAL)
public void onPlayerGameModeChange(PlayerGameModeChangeEvent event) {
if (!boosConfigManager.getCancelWarmUpOnGameModeChange())