Upstream/war
1
0
Fork 0
mirror of https://github.com/taoneill/war.git synced 2024-09-27 22:18:11 +02:00
Code Issues Projects Releases Wiki Activity

Prevent using chests while capturing flag

Browse Source 
Stops duplication of wool.
This commit is contained in:
cmastudios 2013-12-07 20:49:25 -06:00
parent 300f2e383b
commit 034b51ae03
1 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
war/src/main/java/com/tommytony/war/event/WarPlayerListener.java
View File

@ -18,6 +18,7 @@ import org.bukkit.event.EventPriority;
import org.bukkit.event.Listener; import org.bukkit.event.Listener;
import org.bukkit.event.block.Action; import org.bukkit.event.block.Action;
import org.bukkit.event.player.*; import org.bukkit.event.player.*;
import org.bukkit.inventory.InventoryHolder;
import org.bukkit.inventory.ItemStack; import org.bukkit.inventory.ItemStack;
import org.getspout.spoutapi.SpoutManager; import org.getspout.spoutapi.SpoutManager;
import org.getspout.spoutapi.player.SpoutPlayer; import org.getspout.spoutapi.player.SpoutPlayer;
@ -45,7 +46,6 @@ import java.util.logging.Level;
/** /**
* @author tommytony, Tim Düsterhus * @author tommytony, Tim Düsterhus
* @package bukkit.tommytony.war
*/ */
public class WarPlayerListener implements Listener { public class WarPlayerListener implements Listener {
private java.util.Random random = new java.util.Random(); private java.util.Random random = new java.util.Random();
@ -54,7 +54,7 @@ public class WarPlayerListener implements Listener {
/** /**
* Correctly removes quitting players from warzones * Correctly removes quitting players from warzones
* *
* @see PlayerListener.onPlayerQuit() * @see PlayerQuitEvent
*/ */
@EventHandler @EventHandler
public void onPlayerQuit(final PlayerQuitEvent event) { public void onPlayerQuit(final PlayerQuitEvent event) {
@ -153,7 +153,6 @@ public class WarPlayerListener implements Listener {
player.getInventory().containsAtLeast(team.getKind().getBlockHead(), MINIMUM_TEAM_BLOCKS)) { player.getInventory().containsAtLeast(team.getKind().getBlockHead(), MINIMUM_TEAM_BLOCKS)) {
// Can't pick up a second precious block // Can't pick up a second precious block
event.setCancelled(true); event.setCancelled(true);
return;
} }
} }
} }
@ -234,20 +233,26 @@ public class WarPlayerListener implements Listener {
War.war.badMsg(player, "use.ender"); War.war.badMsg(player, "use.ender");
} }
Team team = Team.getTeamByPlayerName(player.getName()); Team team = Team.getTeamByPlayerName(player.getName());
if (team != null && event.getAction() == Action.RIGHT_CLICK_BLOCK && event.getClickedBlock().getType() == Material.ENCHANTMENT_TABLE && team.getTeamConfig().resolveBoolean(TeamConfig.XPKILLMETER)) { if (zone != null && team != null && event.getAction() == Action.RIGHT_CLICK_BLOCK && event.getClickedBlock().getType() == Material.ENCHANTMENT_TABLE && team.getTeamConfig().resolveBoolean(TeamConfig.XPKILLMETER)) {
event.setCancelled(true); event.setCancelled(true);
War.war.badMsg(player, "use.enchant"); War.war.badMsg(player, "use.enchant");
if (zone.getAuthors().contains(player.getName())) { if (zone.getAuthors().contains(player.getName())) {
War.war.badMsg(player, "use.xpkillmeter"); War.war.badMsg(player, "use.xpkillmeter");
} }
} }
if (team != null && event.getAction() == Action.RIGHT_CLICK_BLOCK && event.getClickedBlock().getType() == Material.ANVIL && team.getTeamConfig().resolveBoolean(TeamConfig.XPKILLMETER)) { if (zone != null && team != null && event.getAction() == Action.RIGHT_CLICK_BLOCK && event.getClickedBlock().getType() == Material.ANVIL && team.getTeamConfig().resolveBoolean(TeamConfig.XPKILLMETER)) {
event.setCancelled(true); event.setCancelled(true);
War.war.badMsg(player, "use.anvil"); War.war.badMsg(player, "use.anvil");
if (zone.getAuthors().contains(player.getName())) { if (zone.getAuthors().contains(player.getName())) {
War.war.badMsg(player, "use.xpkillmeter"); War.war.badMsg(player, "use.xpkillmeter");
} }
} }
if (zone != null && team != null && event.getAction() == Action.RIGHT_CLICK_BLOCK
&& event.getClickedBlock().getState() instanceof InventoryHolder
&& zone.isFlagThief(player.getName())) {
event.setCancelled(true);
War.war.badMsg(player, "drop.flag.disabled");
}
} }
if (event.getAction() == Action.RIGHT_CLICK_BLOCK if (event.getAction() == Action.RIGHT_CLICK_BLOCK
@ -784,7 +789,6 @@ public class WarPlayerListener implements Listener {
Warzone zone = Warzone.getZoneByLocation(playerLoc); Warzone zone = Warzone.getZoneByLocation(playerLoc);
event.setTo(zone.getTeleport()); event.setTo(zone.getTeleport());
War.war.badMsg(player, "zone.noteamnotice"); War.war.badMsg(player, "zone.noteamnotice");
return;
} }
} }
@ -800,18 +804,14 @@ public class WarPlayerListener implements Listener {
List<Loadout> loadouts = new ArrayList<Loadout>(playerTeam.getInventories().resolveNewLoadouts()); List<Loadout> loadouts = new ArrayList<Loadout>(playerTeam.getInventories().resolveNewLoadouts());
for (Iterator<Loadout> it = loadouts.iterator(); it.hasNext();) { for (Iterator<Loadout> it = loadouts.iterator(); it.hasNext();) {
Loadout ldt = it.next(); Loadout ldt = it.next();
if ("first".equals(ldt.getName())) { if (ldt.getName().equals("first") ||
(ldt.requiresPermission() && !event.getPlayer().hasPermission(ldt.getPermission()))) {
it.remove(); it.remove();
continue;
}
if (ldt.requiresPermission() && !event.getPlayer().hasPermission(ldt.getPermission())) {
it.remove();
continue;
} }
} }
int currentIndex = (selection.getSelectedIndex() + 1) % loadouts.size(); int currentIndex = (selection.getSelectedIndex() + 1) % loadouts.size();
selection.setSelectedIndex(currentIndex); selection.setSelectedIndex(currentIndex);
playerWarzone.equipPlayerLoadoutSelection(event.getPlayer(), playerTeam, false, true); playerWarzone.equipPlayerLoadoutSelection(event.getPlayer(), playerTeam, false, true);
} else { } else {
War.war.badMsg(event.getPlayer(), "zone.loadout.reenter"); War.war.badMsg(event.getPlayer(), "zone.loadout.reenter");