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

Add logging to ro command - FS-233 (#282)

Browse Source 
* Add logging to ro command - FS-233

* Create a variable for API instead of calling method every time

Co-authored-by: Paldiu <pawereus@gmail.com>
Co-authored-by: Ryan <Wild1145@users.noreply.github.com>
This commit is contained in:
Nathan Curran 2023-01-08 05:31:11 +11:00 committed by GitHub
parent 67b0656e61
commit 1c0b768e4f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 21 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
src/main/java/me/totalfreedom/totalfreedommod/command/Command_ro.java
View File

@ -5,6 +5,7 @@ import java.util.List;
import me.totalfreedom.totalfreedommod.rank.Rank; import me.totalfreedom.totalfreedommod.rank.Rank;
import me.totalfreedom.totalfreedommod.util.FUtil; import me.totalfreedom.totalfreedommod.util.FUtil;
import me.totalfreedom.totalfreedommod.util.Groups; import me.totalfreedom.totalfreedommod.util.Groups;
import net.coreprotect.CoreProtectAPI;
import org.apache.commons.lang.StringUtils; import org.apache.commons.lang.StringUtils;
import org.bukkit.ChatColor; import org.bukkit.ChatColor;
import org.bukkit.Location; import org.bukkit.Location;
@ -22,7 +23,7 @@ import org.bukkit.entity.Player;
public class Command_ro extends FreedomCommand public class Command_ro extends FreedomCommand
{ {
public static int replaceBlocks(Location center, Material fromMaterial, Material toMaterial, int radius) private int removeBlocks(Location center, Material material, int radius, String user)
{ {
int affected = 0; int affected = 0;
@ -35,11 +36,17 @@ public class Command_ro extends FreedomCommand
{ {
Block block = centerBlock.getRelative(xOffset, yOffset, zOffset); Block block = centerBlock.getRelative(xOffset, yOffset, zOffset);
BlockData data = block.getBlockData(); BlockData data = block.getBlockData();
CoreProtectAPI cpAPI = plugin.cpb.getCoreProtectAPI();
if (block.getLocation().distanceSquared(center) < (radius * radius)) if (block.getLocation().distanceSquared(center) < (radius * radius))
{ {
if (fromMaterial.equals(Material.WATER) && data instanceof Waterlogged) if (material.equals(Material.WATER) && data instanceof Waterlogged waterloggedData)
{ {
Waterlogged waterloggedData = (Waterlogged)data; if (cpAPI != null)
{
cpAPI.logRemoval(user, block.getLocation(), material, data);
}
if (waterloggedData.isWaterlogged()) if (waterloggedData.isWaterlogged())
{ {
waterloggedData.setWaterlogged(false); waterloggedData.setWaterlogged(false);
@ -47,12 +54,18 @@ public class Command_ro extends FreedomCommand
affected++; affected++;
continue; continue;
} }
block.setType(toMaterial);
block.setType(Material.AIR);
affected++; affected++;
} }
else if (block.getType().equals(fromMaterial)) else if (block.getType().equals(material))
{ {
block.setType(toMaterial); if (cpAPI != null)
{
cpAPI.logRemoval(user, block.getLocation(), material, data);
}
block.setType(Material.AIR);
affected++; affected++;
} }
} }
@ -155,7 +168,7 @@ public class Command_ro extends FreedomCommand
for (final Material material : materials) for (final Material material : materials)
{ {
affected += replaceBlocks(player.getLocation(), material, Material.AIR, radius); affected += removeBlocks(player.getLocation(), material, radius, sender.getName());
} }
} }
} }
@ -166,7 +179,7 @@ public class Command_ro extends FreedomCommand
FUtil.adminAction(sender.getName(), "Removing all " + names + " within " + radius + " blocks of " + targetPlayer.getName(), false); FUtil.adminAction(sender.getName(), "Removing all " + names + " within " + radius + " blocks of " + targetPlayer.getName(), false);
for (Material material : materials) for (Material material : materials)
{ {
affected += replaceBlocks(targetPlayer.getLocation(), material, Material.AIR, radius); affected += removeBlocks(targetPlayer.getLocation(), material, radius, sender.getName());
} }
} }
} }