TotalFreedomMC/TotalFreedomMod
1
0
Fork 0
mirror of https://github.com/TotalFreedomMC/TotalFreedomMod.git synced 2024-07-04 19:43:21 +00:00
Code Issues Projects Releases Wiki Activity

TFM_PlayerListener cleanup

Browse source
This commit is contained in:
JeromSar 2013-08-27 12:35:32 +02:00
parent f45cc11846
commit 6035f9e50b
3 changed files with 203 additions and 177 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
appinfo.properties
View file

@ -1,5 +1,5 @@
#Tue, 27 Aug 2013 11:50:34 +0200 #Tue, 27 Aug 2013 12:35:14 +0200
program.VERSION=3.1 program.VERSION=3.1
program.BUILDNUM=513 program.BUILDNUM=514
program.BUILDDATE=08/27/2013 11\:50 AM program.BUILDDATE=08/27/2013 12\:35 PM

4
buildnumber.properties
View file

@ -1,3 +1,3 @@
#Build Number for ANT. Do not edit! #Build Number for ANT. Do not edit!
#Tue Aug 27 11:50:34 CEST 2013 #Tue Aug 27 12:35:14 CEST 2013
build.number=514 build.number=515

190
src/me/StevenLawson/TotalFreedomMod/Listener/TFM_PlayerListener.java
View file

@ -37,7 +37,8 @@ public class TFM_PlayerListener implements Listener
@EventHandler(priority = EventPriority.HIGH) @EventHandler(priority = EventPriority.HIGH)
public void onPlayerInteract(PlayerInteractEvent event) public void onPlayerInteract(PlayerInteractEvent event)
{ {
Player player = event.getPlayer(); final Player player = event.getPlayer();
final TFM_PlayerData playerdata = TFM_PlayerData.getPlayerData(player);
switch (event.getAction()) switch (event.getAction())
{ {
@ -48,37 +49,46 @@ public class TFM_PlayerListener implements Listener
{ {
case WATER_BUCKET: case WATER_BUCKET:
{ {
if (!TFM_ConfigEntry.ALLOW_WATER_PLACE.getBoolean()) if (TFM_ConfigEntry.ALLOW_WATER_PLACE.getBoolean())
{ {
break;
}
player.getInventory().setItem(player.getInventory().getHeldItemSlot(), new ItemStack(Material.COOKIE, 1)); player.getInventory().setItem(player.getInventory().getHeldItemSlot(), new ItemStack(Material.COOKIE, 1));
player.sendMessage(ChatColor.GRAY + "Water buckets are currently disabled."); player.sendMessage(ChatColor.GRAY + "Water buckets are currently disabled.");
event.setCancelled(true); event.setCancelled(true);
}
break; break;
} }
case LAVA_BUCKET: case LAVA_BUCKET:
{ {
if (!TFM_ConfigEntry.ALLOW_LAVA_PLACE.getBoolean()) if (TFM_ConfigEntry.ALLOW_LAVA_PLACE.getBoolean())
{ {
break;
}
player.getInventory().setItem(player.getInventory().getHeldItemSlot(), new ItemStack(Material.COOKIE, 1)); player.getInventory().setItem(player.getInventory().getHeldItemSlot(), new ItemStack(Material.COOKIE, 1));
player.sendMessage(ChatColor.GRAY + "Lava buckets are currently disabled."); player.sendMessage(ChatColor.GRAY + "Lava buckets are currently disabled.");
event.setCancelled(true); event.setCancelled(true);
}
break; break;
} }
case EXPLOSIVE_MINECART: case EXPLOSIVE_MINECART:
{ {
if (!TFM_ConfigEntry.ALLOW_TNT_MINECARTS.getBoolean()) if (TFM_ConfigEntry.ALLOW_TNT_MINECARTS.getBoolean())
{ {
break;
}
player.getInventory().clear(player.getInventory().getHeldItemSlot()); player.getInventory().clear(player.getInventory().getHeldItemSlot());
player.sendMessage(ChatColor.GRAY + "TNT minecarts are currently disabled."); player.sendMessage(ChatColor.GRAY + "TNT minecarts are currently disabled.");
event.setCancelled(true); event.setCancelled(true);
}
break; break;
} }
} }
break; break;
} }
case LEFT_CLICK_AIR: case LEFT_CLICK_AIR:
case LEFT_CLICK_BLOCK: case LEFT_CLICK_BLOCK:
{ {
@ -113,9 +123,11 @@ public class TFM_PlayerListener implements Listener
case BONE: case BONE:
{ {
TFM_PlayerData playerdata = TFM_PlayerData.getPlayerData(player); if (!playerdata.mobThrowerEnabled())
if (playerdata.mobThrowerEnabled())
{ {
break;
}
Location player_pos = player.getLocation(); Location player_pos = player.getLocation();
Vector direction = player_pos.getDirection().normalize(); Vector direction = player_pos.getDirection().normalize();
@ -124,15 +136,18 @@ public class TFM_PlayerListener implements Listener
playerdata.enqueueMob(rezzed_mob); playerdata.enqueueMob(rezzed_mob);
event.setCancelled(true); event.setCancelled(true);
}
break; break;
} }
case SULPHUR: case SULPHUR:
{ {
TFM_PlayerData playerdata = TFM_PlayerData.getPlayerData(player); if (!playerdata.isMP44Armed())
if (playerdata.isMP44Armed())
{ {
break;
}
event.setCancelled(true);
if (playerdata.toggleMP44Firing()) if (playerdata.toggleMP44Firing())
{ {
playerdata.startArrowShooter(TotalFreedomMod.plugin); playerdata.startArrowShooter(TotalFreedomMod.plugin);
@ -141,18 +156,22 @@ public class TFM_PlayerListener implements Listener
{ {
playerdata.stopArrowShooter(); playerdata.stopArrowShooter();
} }
event.setCancelled(true);
}
break; break;
} }
case BLAZE_ROD: case BLAZE_ROD:
{ {
if (TFM_ConfigEntry.ALLOW_EXPLOSIONS.getBoolean()) if (!TFM_ConfigEntry.ALLOW_EXPLOSIONS.getBoolean())
{ {
if (TFM_SuperadminList.isSeniorAdmin(player, true)) break;
}
if (!TFM_SuperadminList.isSeniorAdmin(player, true))
{ {
break;
}
event.setCancelled(true);
Block targetBlock; Block targetBlock;
if (event.getAction().equals(Action.LEFT_CLICK_AIR)) if (event.getAction().equals(Action.LEFT_CLICK_AIR))
@ -164,53 +183,55 @@ public class TFM_PlayerListener implements Listener
targetBlock = event.getClickedBlock(); targetBlock = event.getClickedBlock();
} }
if (targetBlock != null) if (targetBlock == null)
{
player.getWorld().createExplosion(targetBlock.getLocation(), 4F, true);
player.getWorld().strikeLightning(targetBlock.getLocation());
}
else
{ {
player.sendMessage("Can't resolve target block."); player.sendMessage("Can't resolve target block.");
break;
} }
event.setCancelled(true); player.getWorld().createExplosion(targetBlock.getLocation(), 4F, true);
} player.getWorld().strikeLightning(targetBlock.getLocation());
}
break; break;
} }
case CARROT: case CARROT:
{ {
if (TFM_ConfigEntry.ALLOW_EXPLOSIONS.getBoolean()) if (!TFM_ConfigEntry.ALLOW_EXPLOSIONS.getBoolean())
{ {
if (TFM_SuperadminList.isSeniorAdmin(player, true)) break;
{ }
Location player_location = player.getLocation().clone();
Vector player_pos = player_location.toVector().add(new Vector(0.0, 1.65, 0.0)); if (!TFM_SuperadminList.isSeniorAdmin(player, true))
Vector player_dir = player_location.getDirection().normalize(); {
break;
}
Location location = player.getLocation().clone();
Vector playerPostion = location.toVector().add(new Vector(0.0, 1.65, 0.0));
Vector playerDirection = location.getDirection().normalize();
double distance = 150.0; double distance = 150.0;
Block targetBlock = player.getTargetBlock(null, Math.round((float) distance)); Block targetBlock = player.getTargetBlock(null, Math.round((float) distance));
if (targetBlock != null) if (targetBlock != null)
{ {
distance = player_location.distance(targetBlock.getLocation()); distance = location.distance(targetBlock.getLocation());
} }
final List<Block> affected = new ArrayList<Block>(); final List<Block> affected = new ArrayList<Block>();
Block last_block = null; Block lastBlock = null;
for (double offset = 0.0; offset <= distance; offset += (distance / 25.0)) for (double offset = 0.0; offset <= distance; offset += (distance / 25.0))
{ {
Block test_block = player_pos.clone().add(player_dir.clone().multiply(offset)).toLocation(player.getWorld()).getBlock(); Block block = playerPostion.clone().add(playerDirection.clone().multiply(offset)).toLocation(player.getWorld()).getBlock();
if (!test_block.equals(last_block)) if (!block.equals(lastBlock))
{ {
if (test_block.isEmpty()) if (block.isEmpty())
{ {
affected.add(test_block); affected.add(block);
test_block.setType(Material.TNT); block.setType(Material.TNT);
} }
else else
{ {
@ -218,7 +239,7 @@ public class TFM_PlayerListener implements Listener
} }
} }
last_block = test_block; lastBlock = block;
} }
new BukkitRunnable() new BukkitRunnable()
@ -226,18 +247,16 @@ public class TFM_PlayerListener implements Listener
@Override @Override
public void run() public void run()
{ {
for (Block tnt_block : affected) for (Block tntBlock : affected)
{ {
TNTPrimed tnt_primed = tnt_block.getWorld().spawn(tnt_block.getLocation(), TNTPrimed.class); TNTPrimed tnt = tntBlock.getWorld().spawn(tntBlock.getLocation(), TNTPrimed.class);
tnt_primed.setFuseTicks(5); tnt.setFuseTicks(5);
tnt_block.setType(Material.AIR); tntBlock.setType(Material.AIR);
} }
} }
}.runTaskLater(TotalFreedomMod.plugin, 30L); }.runTaskLater(TotalFreedomMod.plugin, 30L);
event.setCancelled(true); event.setCancelled(true);
}
}
break; break;
} }
} }
@ -279,52 +298,52 @@ public class TFM_PlayerListener implements Listener
for (Entry<Player, Double> fuckoff : TotalFreedomMod.fuckoffEnabledFor.entrySet()) for (Entry<Player, Double> fuckoff : TotalFreedomMod.fuckoffEnabledFor.entrySet())
{ {
Player fuckoff_player = fuckoff.getKey(); Player fuckoffPlayer = fuckoff.getKey();
if (fuckoff_player.equals(player) || !fuckoff_player.isOnline()) if (fuckoffPlayer.equals(player) || !fuckoffPlayer.isOnline())
{ {
continue; continue;
} }
double fuckoff_range = fuckoff.getValue().doubleValue(); double fuckoffRange = fuckoff.getValue().doubleValue();
Location mover_pos = player.getLocation(); Location playerLocation = player.getLocation();
Location fuckoff_pos = fuckoff_player.getLocation(); Location fuckoffLocation = fuckoffPlayer.getLocation();
double distanceSquared; double distanceSquared;
try try
{ {
distanceSquared = mover_pos.distanceSquared(fuckoff_pos); distanceSquared = playerLocation.distanceSquared(fuckoffLocation);
} }
catch (IllegalArgumentException ex) catch (IllegalArgumentException ex)
{ {
continue; continue;
} }
if (distanceSquared < (fuckoff_range * fuckoff_range)) if (distanceSquared < (fuckoffRange * fuckoffRange))
{ {
event.setTo(fuckoff_pos.clone().add(mover_pos.subtract(fuckoff_pos).toVector().normalize().multiply(fuckoff_range * 1.1))); event.setTo(fuckoffLocation.clone().add(playerLocation.subtract(fuckoffLocation).toVector().normalize().multiply(fuckoffRange * 1.1)));
break; break;
} }
} }
boolean do_freeze = false; boolean freeze = false;
if (TotalFreedomMod.allPlayersFrozen) if (TotalFreedomMod.allPlayersFrozen)
{ {
if (!TFM_SuperadminList.isUserSuperadmin(player)) if (!TFM_SuperadminList.isUserSuperadmin(player))
{ {
do_freeze = true; freeze = true;
} }
} }
else else
{ {
if (playerdata.isFrozen()) if (playerdata.isFrozen())
{ {
do_freeze = true; freeze = true;
} }
} }
if (do_freeze) if (freeze)
{ {
Location freezeTo = to.clone(); Location freezeTo = to.clone();
@ -339,17 +358,17 @@ public class TFM_PlayerListener implements Listener
{ {
Location targetPos = player.getLocation().add(0, 1, 0); Location targetPos = player.getLocation().add(0, 1, 0);
boolean out_of_cage; boolean outOfCage;
if (!targetPos.getWorld().equals(playerdata.getCagePos().getWorld())) if (!targetPos.getWorld().equals(playerdata.getCagePos().getWorld()))
{ {
out_of_cage = true; outOfCage = true;
} }
else else
{ {
out_of_cage = targetPos.distanceSquared(playerdata.getCagePos()) > (2.5 * 2.5); outOfCage = targetPos.distanceSquared(playerdata.getCagePos()) > (2.5 * 2.5);
} }
if (out_of_cage) if (outOfCage)
{ {
playerdata.setCaged(true, targetPos, playerdata.getCageMaterial(TFM_PlayerData.CageLayer.OUTER), playerdata.getCageMaterial(TFM_PlayerData.CageLayer.INNER)); playerdata.setCaged(true, targetPos, playerdata.getCageMaterial(TFM_PlayerData.CageLayer.OUTER), playerdata.getCageMaterial(TFM_PlayerData.CageLayer.INNER));
playerdata.regenerateHistory(); playerdata.regenerateHistory();
@ -373,43 +392,51 @@ public class TFM_PlayerListener implements Listener
TFM_Jumppads.getInstance().PlayerMoveEvent(event); TFM_Jumppads.getInstance().PlayerMoveEvent(event);
} }
if (TFM_ConfigEntry.LANDMINES_ENABLED.getBoolean() && TFM_ConfigEntry.ALLOW_EXPLOSIONS.getBoolean()) if (!(TFM_ConfigEntry.LANDMINES_ENABLED.getBoolean() && TFM_ConfigEntry.ALLOW_EXPLOSIONS.getBoolean()))
{ {
return;
}
Iterator<TFM_LandmineData> landmines = TFM_LandmineData.landmines.iterator(); Iterator<TFM_LandmineData> landmines = TFM_LandmineData.landmines.iterator();
while (landmines.hasNext()) while (landmines.hasNext())
{ {
TFM_LandmineData landmine = landmines.next(); TFM_LandmineData landmine = landmines.next();
Location landmine_pos = landmine.location; Location location = landmine.location;
if (landmine_pos.getBlock().getType() != Material.TNT) if (location.getBlock().getType() != Material.TNT)
{ {
landmines.remove(); landmines.remove();
continue; continue;
} }
if (!landmine.player.equals(player)) if (landmine.player.equals(player))
{ {
if (player.getWorld().equals(landmine_pos.getWorld())) break;
}
if (!player.getWorld().equals(location.getWorld()))
{ {
if (player.getLocation().distanceSquared(landmine_pos) <= (landmine.radius * landmine.radius)) break;
}
if (!(player.getLocation().distanceSquared(location) <= (landmine.radius * landmine.radius)))
{ {
break;
}
landmine.location.getBlock().setType(Material.AIR); landmine.location.getBlock().setType(Material.AIR);
TNTPrimed tnt1 = landmine_pos.getWorld().spawn(landmine_pos, TNTPrimed.class); TNTPrimed tnt1 = location.getWorld().spawn(location, TNTPrimed.class);
tnt1.setFuseTicks(40); tnt1.setFuseTicks(40);
tnt1.setPassenger(player); tnt1.setPassenger(player);
tnt1.setVelocity(new Vector(0.0, 2.0, 0.0)); tnt1.setVelocity(new Vector(0.0, 2.0, 0.0));
TNTPrimed tnt2 = landmine_pos.getWorld().spawn(player.getLocation(), TNTPrimed.class); TNTPrimed tnt2 = location.getWorld().spawn(player.getLocation(), TNTPrimed.class);
tnt2.setFuseTicks(1); tnt2.setFuseTicks(1);
player.setGameMode(GameMode.SURVIVAL); player.setGameMode(GameMode.SURVIVAL);
landmines.remove(); landmines.remove();
} }
}
}
}
}
} }
@ -456,6 +483,7 @@ public class TFM_PlayerListener implements Listener
event.setCancelled(true); event.setCancelled(true);
return; return;
} }
playerdata.setLastMessage(message); playerdata.setLastMessage(message);
// Check for muted // Check for muted
@ -467,11 +495,9 @@ public class TFM_PlayerListener implements Listener
event.setCancelled(true); event.setCancelled(true);
return; return;
} }
else
{
playerdata.setMuted(false); playerdata.setMuted(false);
} }
}
// Strip color from messages // Strip color from messages
message = ChatColor.stripColor(message); message = ChatColor.stripColor(message);
@ -558,9 +584,9 @@ public class TFM_PlayerListener implements Listener
{ {
if (!TFM_SuperadminList.isUserSuperadmin(player)) if (!TFM_SuperadminList.isUserSuperadmin(player))
{ {
for (String test_command : BLOCKED_MUTED_CMDS) for (String commandName : BLOCKED_MUTED_CMDS)
{ {
if (Pattern.compile("^/" + test_command.toLowerCase() + " ").matcher(command).find()) if (Pattern.compile("^/" + commandName.toLowerCase() + " ").matcher(command).find())
{ {
player.sendMessage(ChatColor.RED + "That command is blocked while you are muted."); player.sendMessage(ChatColor.RED + "That command is blocked while you are muted.");
event.setCancelled(true); event.setCancelled(true);
@ -661,13 +687,13 @@ public class TFM_PlayerListener implements Listener
TFM_UserList.getInstance(TotalFreedomMod.plugin).addUser(player); TFM_UserList.getInstance(TotalFreedomMod.plugin).addUser(player);
boolean superadmin_impostor = TFM_SuperadminList.isSuperadminImpostor(player); boolean impostor = TFM_SuperadminList.isSuperadminImpostor(player);
if (superadmin_impostor || TFM_SuperadminList.isUserSuperadmin(player)) if (impostor || TFM_SuperadminList.isUserSuperadmin(player))
{ {
TFM_Util.bcastMsg(ChatColor.AQUA + player.getName() + " is " + TFM_Util.getRank(player)); TFM_Util.bcastMsg(ChatColor.AQUA + player.getName() + " is " + TFM_Util.getRank(player));
if (superadmin_impostor) if (impostor)
{ {
player.getInventory().clear(); player.getInventory().clear();
player.setOp(false); player.setOp(false);