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

This somehow got reverted back to the old version

Browse Source 
Reblocks bigtree in the plotworld as it is used to grief. Players can still use the /tool tree comamnd from WorldEdit to achieve the same thing
This commit is contained in:
Telesphoreo 2020-09-26 14:52:13 -05:00
parent 55522e8191
commit d203772a9a
1 changed files with 16 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/main/java/me/totalfreedom/totalfreedommod/world/WorldRestrictions.java
View File

@ -10,6 +10,7 @@ import java.util.HashMap;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import me.totalfreedom.totalfreedommod.FreedomService; import me.totalfreedom.totalfreedommod.FreedomService;
import org.bukkit.Bukkit;
import org.bukkit.ChatColor; import org.bukkit.ChatColor;
import org.bukkit.World; import org.bukkit.World;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;
@ -28,6 +29,9 @@ public class WorldRestrictions extends FreedomService
private final List<String> BLOCKED_WORLDEDIT_COMMANDS = Arrays.asList( private final List<String> BLOCKED_WORLDEDIT_COMMANDS = Arrays.asList(
"green", "fixlava", "fixwater", "br", "brush", "tool", "mat", "range", "cs", "up", "fill", "setblock", "tree", "replacenear", "bigtree"); "green", "fixlava", "fixwater", "br", "brush", "tool", "mat", "range", "cs", "up", "fill", "setblock", "tree", "replacenear", "bigtree");
private final List<String> BLOCKED_ESSENTIALS_COMMANDS = Arrays.asList(
"bigtree", "ebigtree", "largetree", "elargetree");
private final Map<Flag<?>, Object> flags = new HashMap<Flag<?>, Object>() private final Map<Flag<?>, Object> flags = new HashMap<Flag<?>, Object>()
{{ {{
put(Flags.PLACE_VEHICLE, StateFlag.State.DENY); put(Flags.PLACE_VEHICLE, StateFlag.State.DENY);
@ -57,12 +61,7 @@ public class WorldRestrictions extends FreedomService
} }
} }
if (!plugin.sl.isStaff(player) && player.getWorld().equals(plugin.wm.staffworld.getWorld())) return !plugin.sl.isStaff(player) && player.getWorld().equals(plugin.wm.staffworld.getWorld());
{
return true;
}
return false;
} }
@EventHandler(priority = EventPriority.NORMAL) @EventHandler(priority = EventPriority.NORMAL)
@ -127,12 +126,12 @@ public class WorldRestrictions extends FreedomService
public void onCommandPreprocess(PlayerCommandPreprocessEvent event) public void onCommandPreprocess(PlayerCommandPreprocessEvent event)
{ {
final Player player = event.getPlayer(); final Player player = event.getPlayer();
String command = event.getMessage().split("\\s+")[0].substring(1).toLowerCase();
if (doRestrict(player)) if (doRestrict(player))
{ {
/* This is a very poor way of blocking WorldEdit commands, all the methods I know of /* This is a very poor way of blocking WorldEdit commands, all the methods I know of
for obtaining a list of a plugin's commands are returning null for world edit. */ for obtaining a list of a plugin's commands are returning null for world edit. */
String command = event.getMessage().split("\\s+")[0].substring(1, event.getMessage().split("\\s+")[0].length()).toLowerCase();
String allowed = player.getWorld().equals(plugin.wm.staffworld.getWorld()) ? "Staff" : "Master Builders"; String allowed = player.getWorld().equals(plugin.wm.staffworld.getWorld()) ? "Staff" : "Master Builders";
if (command.startsWith("/") || BLOCKED_WORLDEDIT_COMMANDS.contains(command)) if (command.startsWith("/") || BLOCKED_WORLDEDIT_COMMANDS.contains(command))
@ -147,8 +146,16 @@ public class WorldRestrictions extends FreedomService
event.setCancelled(true); event.setCancelled(true);
} }
} }
}
if (player.getWorld().equals(Bukkit.getWorld("plotworld")))
{
if (BLOCKED_ESSENTIALS_COMMANDS.contains(command))
{
player.sendMessage(ChatColor.RED + "Sorry, this command is restricted in the plotworld");
event.setCancelled(true);
}
}
}
public void protectWorld(World world) public void protectWorld(World world)
{ {