Added tnt yield config.

Added location to radar.
Changed /rd worldedit shortcut. TODO: Detect if worldedit is enabled first.
This commit is contained in:
Steven Lawson 2011-09-25 22:24:54 -04:00
parent 18ddcc7560
commit c769f98c8a
3 changed files with 13 additions and 11 deletions

View file

@ -1,17 +1,20 @@
package me.StevenLawson.TotalFreedomMod; package me.StevenLawson.TotalFreedomMod;
import java.util.Comparator; import java.util.Comparator;
import org.bukkit.Location;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;
public class RadarData implements Comparator<RadarData> public class RadarData implements Comparator<RadarData>
{ {
Player player; Player player;
double distance; double distance;
Location location;
public RadarData(Player inplayer, double indistance) public RadarData(Player inplayer, double indistance, Location inlocation)
{ {
this.player = inplayer; this.player = inplayer;
this.distance = indistance; this.distance = indistance;
this.location = inlocation;
} }
public RadarData() public RadarData()

View file

@ -29,7 +29,7 @@ public class TotalFreedomMod extends JavaPlugin
public Boolean allowExplosions = false; public Boolean allowExplosions = false;
public Boolean allowLavaDamage = false; public Boolean allowLavaDamage = false;
public Boolean allowFire = false; public Boolean allowFire = false;
public double explosiveRadius = 1.0; public double explosiveRadius = 2.0;
public final static String MSG_NO_PERMS = ChatColor.YELLOW + "You do not have permission to use this command."; public final static String MSG_NO_PERMS = ChatColor.YELLOW + "You do not have permission to use this command.";
public final static String YOU_ARE_OP = ChatColor.YELLOW + "You are now op!"; public final static String YOU_ARE_OP = ChatColor.YELLOW + "You are now op!";
public final static String YOU_ARE_NOT_OP = ChatColor.YELLOW + "You are no longer op!"; public final static String YOU_ARE_NOT_OP = ChatColor.YELLOW + "You are no longer op!";
@ -518,8 +518,7 @@ public class TotalFreedomMod extends JavaPlugin
if (args[0].equalsIgnoreCase("on")) if (args[0].equalsIgnoreCase("on"))
{ {
this.allowExplosions = true; this.allowExplosions = true;
//sender.sendMessage("Explosives are now enabled, radius set to " + explosiveRadius + " blocks."); sender.sendMessage("Explosives are now enabled, radius set to " + explosiveRadius + " blocks.");
sender.sendMessage("Explosives are now enabled.");
} }
else else
{ {
@ -606,7 +605,7 @@ public class TotalFreedomMod extends JavaPlugin
{ {
if (sender_world.equals(p.getWorld().getName()) && !p.getName().equals(sender.getName())) if (sender_world.equals(p.getWorld().getName()) && !p.getName().equals(sender.getName()))
{ {
radar_data.add(new RadarData(p, sender_pos.distance(p.getLocation()))); radar_data.add(new RadarData(p, sender_pos.distance(p.getLocation()), p.getLocation()));
} }
} }
@ -628,7 +627,7 @@ public class TotalFreedomMod extends JavaPlugin
break; break;
} }
sender.sendMessage(ChatColor.YELLOW + String.format("%s - %d", i.player.getName(), Math.round(i.distance))); sender.sendMessage(ChatColor.YELLOW + String.format("%s - %d blocks away @ ", i.player.getName(), Math.round(i.distance), formatLocation(i.location)));
} }
return true; return true;
@ -643,11 +642,11 @@ public class TotalFreedomMod extends JavaPlugin
if (sender.isOp()) if (sender.isOp())
{ {
sender.sendMessage(ChatColor.GRAY + "Using WorldEdit to remove all entity drops."); sender.sendMessage(ChatColor.GRAY + "Using WorldEdit to remove all dropped items, arrows, and TNT.");
Bukkit.getServer().dispatchCommand(sender, "remove arrows -1");
Bukkit.getServer().dispatchCommand(sender, "remove items -1"); Bukkit.getServer().dispatchCommand(sender, "remove items -1");
Bukkit.getServer().dispatchCommand(sender, "remove drops -1"); Bukkit.getServer().dispatchCommand(sender, "remove arrows -1");
Bukkit.getServer().dispatchCommand(sender, "remove tnt -1");
} }
else else
{ {

View file

@ -23,8 +23,8 @@ public class TotalFreedomModEntityListener extends EntityListener
event.setCancelled(true); event.setCancelled(true);
return; return;
} }
//event.setYield((float)plugin.explosiveRadius); event.setYield((float)plugin.explosiveRadius);
} }
@Override @Override