AtlasMediaGroup/TotalFreedomMod
1
0
Fork 0
mirror of https://github.com/AtlasMediaGroup/TotalFreedomMod.git synced 2024-11-27 01:05:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix expel.

Browse Source 
Fix regex.
This commit is contained in:
Steven Lawson 2012-12-01 14:11:10 -05:00
parent f5891ae23b
commit abf78c49bb
2 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/me/StevenLawson/TotalFreedomMod/Commands/Command_expel.java
View File

@ -4,7 +4,6 @@ import org.bukkit.Location;
import org.bukkit.command.Command; import org.bukkit.command.Command;
import org.bukkit.command.CommandSender; import org.bukkit.command.CommandSender;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;
import org.bukkit.util.Vector;
@CommandPermissions(level = ADMIN_LEVEL.SUPER, source = SOURCE_TYPE_ALLOWED.ONLY_IN_GAME, ignore_permissions = false) @CommandPermissions(level = ADMIN_LEVEL.SUPER, source = SOURCE_TYPE_ALLOWED.ONLY_IN_GAME, ignore_permissions = false)
public class Command_expel extends TFM_Command public class Command_expel extends TFM_Command
@ -12,14 +11,14 @@ public class Command_expel extends TFM_Command
@Override @Override
public boolean run(CommandSender sender, Player sender_p, Command cmd, String commandLabel, String[] args, boolean senderIsConsole) public boolean run(CommandSender sender, Player sender_p, Command cmd, String commandLabel, String[] args, boolean senderIsConsole)
{ {
double radius = 50.0; double radius = 15.0;
double strength = 100.0; double strength = 20.0;
if (args.length >= 1) if (args.length >= 1)
{ {
try try
{ {
radius = Math.max(1.0, Math.min(200.0, Double.parseDouble(args[0]))); radius = Math.max(1.0, Math.min(100.0, Double.parseDouble(args[0])));
} }
catch (NumberFormatException nfex) catch (NumberFormatException nfex)
{ {
@ -30,7 +29,7 @@ public class Command_expel extends TFM_Command
{ {
try try
{ {
strength = Math.max(0.0, Math.min(200.0, Double.parseDouble(args[1]))); strength = Math.max(0.0, Math.min(50.0, Double.parseDouble(args[1])));
} }
catch (NumberFormatException nfex) catch (NumberFormatException nfex)
{ {
@ -55,9 +54,8 @@ public class Command_expel extends TFM_Command
if (in_range) if (in_range)
{ {
sender.sendMessage("Pushing " + p.getName()); p.setVelocity(target_pos.clone().subtract(sender_pos).toVector().normalize().multiply(strength));
Vector expel_direction = target_pos.subtract(sender_pos).toVector().normalize(); sender.sendMessage("Pushing " + p.getName() + ".");
p.setVelocity(expel_direction.multiply(strength));
} }
} }
} }

4
src/me/StevenLawson/TotalFreedomMod/TFM_Util.java
View File

@ -930,8 +930,8 @@ public class TFM_Util
{ {
boolean is_match = true; boolean is_match = true;
String[] a_parts = StringUtils.split(a, '.'); String[] a_parts = a.split("\\.");
String[] b_parts = StringUtils.split(b, '.'); String[] b_parts = b.split("\\.");
if (a_parts.length != 4 || b_parts.length != 4) if (a_parts.length != 4 || b_parts.length != 4)
{ {