TheDeusGroup/TFM-4.3-Reloaded
1
0
Fork 0
mirror of https://github.com/TheDeus-Group/TFM-4.3-Reloaded.git synced 2024-06-11 15:06:00 +00:00
Code Issues Projects Releases Wiki Activity

Modified /ro to not affect adminworld.

Browse source
This commit is contained in:
Steven Lawson 2014-08-30 15:18:45 -04:00
parent 8cae042857
commit 107952f0ba
1 changed files with 25 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

34
src/me/StevenLawson/TotalFreedomMod/Commands/Command_ro.java
View file

@ -3,9 +3,11 @@ package me.StevenLawson.TotalFreedomMod.Commands;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
import me.StevenLawson.TotalFreedomMod.TFM_Util; import me.StevenLawson.TotalFreedomMod.TFM_Util;
import me.StevenLawson.TotalFreedomMod.World.TFM_AdminWorld;
import net.minecraft.util.org.apache.commons.lang3.StringUtils; import net.minecraft.util.org.apache.commons.lang3.StringUtils;
import org.bukkit.ChatColor; import org.bukkit.ChatColor;
import org.bukkit.Material; import org.bukkit.Material;
import org.bukkit.World;
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;
@ -24,10 +26,7 @@ public class Command_ro extends TFM_Command
final List<Material> materials = new ArrayList<Material>(); final List<Material> materials = new ArrayList<Material>();
for (String materialName : (args[0].contains(",") ? args[0].split(",") : new String[] for (String materialName : StringUtils.split(args[0], ","))
{
args[0]
}))
{ {
Material fromMaterial = Material.matchMaterial(materialName); Material fromMaterial = Material.matchMaterial(materialName);
if (fromMaterial == null) if (fromMaterial == null)
@ -81,14 +80,28 @@ public class Command_ro extends TFM_Command
final String names = StringUtils.join(materials, ", "); final String names = StringUtils.join(materials, ", ");
World adminWorld = null;
try
{
adminWorld = TFM_AdminWorld.getInstance().getWorld();
}
catch (Exception ex)
{
}
int affected = 0; int affected = 0;
if (targetPlayer == null) if (targetPlayer == null)
{ {
TFM_Util.adminAction(sender.getName(), "Removing all " + names + " within " + radius + " blocks of all players... Brace for lag!", false); TFM_Util.adminAction(sender.getName(), "Removing all " + names + " within " + radius + " blocks of all players... Brace for lag!", false);
for (Material material : materials) for (final Player player : server.getOnlinePlayers())
{ {
for (Player player : server.getOnlinePlayers()) if (player.getWorld() == adminWorld)
{
continue;
}
for (final Material material : materials)
{ {
affected += TFM_Util.replaceBlocks(player.getLocation(), material, Material.AIR, radius); affected += TFM_Util.replaceBlocks(player.getLocation(), material, Material.AIR, radius);
} }
@ -96,10 +109,13 @@ public class Command_ro extends TFM_Command
} }
else else
{ {
for (Material material : materials) if (targetPlayer.getWorld() != adminWorld)
{ {
TFM_Util.adminAction(sender.getName(), "Removing all " + names + " within " + radius + " blocks of " + targetPlayer.getName(), false); for (Material material : materials)
affected += TFM_Util.replaceBlocks(targetPlayer.getLocation(), material, Material.AIR, radius); {
TFM_Util.adminAction(sender.getName(), "Removing all " + names + " within " + radius + " blocks of " + targetPlayer.getName(), false);
affected += TFM_Util.replaceBlocks(targetPlayer.getLocation(), material, Material.AIR, radius);
}
} }
} }