Upstream/WorldSystem
1
0
Fork 0
mirror of https://github.com/trainerlord/WorldSystem.git synced 2025-02-23 02:21:26 +01:00
Code Issues Projects Releases Wiki Activity

Fix some unhandled errors, fix delete line in help

Browse Source
This commit is contained in:
Toxi Woxi 2023-11-21 23:24:06 -05:00
parent f8ea0bac84
commit 6b73a18de8
4 changed files with 28 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/de/butzlabben/world/command/commands/WSCommands.java
View File

@ -31,10 +31,10 @@ public class WSCommands {
prefix + "WorldSystem by CrazyCloudCraft v" + WorldSystem.getInstance().getDescription().getVersion()); prefix + "WorldSystem by CrazyCloudCraft v" + WorldSystem.getInstance().getDescription().getVersion());
cs.sendMessage(prefix + "Contributors: Jubeki, montlikadani, jstoeckm2, Butzlabben"); cs.sendMessage(prefix + "Contributors: Jubeki, montlikadani, jstoeckm2, Butzlabben");
List<String> cmdHelp = MessageConfig.getCommandHelp(); List<String> cmdHelp = MessageConfig.getCommandHelp();
cmdHelp.forEach(s -> cs.sendMessage("\u00A76" + s)); //(prefix + s)); cmdHelp.forEach(s -> cs.sendMessage("§6" + s)); //(prefix + s));
// cs.sendMessage(prefix + "=============="); // cs.sendMessage(prefix + "==============");
if (cs.hasPermission("ws.delete")) { if (cs.hasPermission("ws.delete")) {
cs.sendMessage(MessageConfig.getDeleteCommandHelp()); cs.sendMessage("§6" + MessageConfig.getDeleteCommandHelp());
} }
return true; return true;
} }

18
src/main/java/de/butzlabben/world/command/commands/WorldAdministrateCommand.java
View File

@ -98,6 +98,11 @@ public class WorldAdministrateCommand {
return false; return false;
} }
if (p.getName().toLowerCase().equals(args[1].toLowerCase())) {
p.sendMessage(PluginConfig.getPrefix() + "§cYou cannot remove yourself!");
return false;
}
DependenceConfig dc = new DependenceConfig(p); DependenceConfig dc = new DependenceConfig(p);
if (!dc.hasWorld()) { if (!dc.hasWorld()) {
p.sendMessage(MessageConfig.getNoWorldOwn()); p.sendMessage(MessageConfig.getNoWorldOwn());
@ -215,6 +220,11 @@ public class WorldAdministrateCommand {
return false; return false;
} }
if (p.getName().toLowerCase().equals(args[1].toLowerCase())) {
p.sendMessage(PluginConfig.getPrefix() + "§cYou're already a member!");
return false;
}
DependenceConfig dc = new DependenceConfig(p); DependenceConfig dc = new DependenceConfig(p);
if (!dc.hasWorld()) { if (!dc.hasWorld()) {
p.sendMessage(MessageConfig.getNoWorldOwn()); p.sendMessage(MessageConfig.getNoWorldOwn());
@ -269,7 +279,7 @@ public class WorldAdministrateCommand {
} }
WorldPlayer wp = new WorldPlayer(a, dc.getWorldname()); WorldPlayer wp = new WorldPlayer(a, dc.getWorldname());
if (wp.isOwnerofWorld()) { if (wp.isOwnerofWorld()) {
p.sendMessage(PluginConfig.getPrefix() + "§cYou are the owner"); p.sendMessage(PluginConfig.getPrefix() + "§cYou cannot disable teleporting for yourself!");
return false; return false;
} }
if (wp.toggleTeleport()) { if (wp.toggleTeleport()) {
@ -306,7 +316,7 @@ public class WorldAdministrateCommand {
} }
WorldPlayer wp = new WorldPlayer(a, dc.getWorldname()); WorldPlayer wp = new WorldPlayer(a, dc.getWorldname());
if (wp.isOwnerofWorld()) { if (wp.isOwnerofWorld()) {
p.sendMessage(PluginConfig.getPrefix() + "§cYou are the owner"); p.sendMessage(PluginConfig.getPrefix() + "§cYou cannot disable gamemode changing for yourself!");
return false; return false;
} }
if (wp.toggleGamemode()) { if (wp.toggleGamemode()) {
@ -343,7 +353,7 @@ public class WorldAdministrateCommand {
} }
WorldPlayer wp = new WorldPlayer(a, dc.getWorldname()); WorldPlayer wp = new WorldPlayer(a, dc.getWorldname());
if (wp.isOwnerofWorld()) { if (wp.isOwnerofWorld()) {
p.sendMessage(PluginConfig.getPrefix() + "§cYou are the owner"); p.sendMessage(PluginConfig.getPrefix() + "§cYou cannot disable WorldEdit for yourself!");
return false; return false;
} }
if (wp.toggleWorldEdit()) { if (wp.toggleWorldEdit()) {
@ -380,7 +390,7 @@ public class WorldAdministrateCommand {
} }
WorldPlayer wp = new WorldPlayer(a, dc.getWorldname()); WorldPlayer wp = new WorldPlayer(a, dc.getWorldname());
if (wp.isOwnerofWorld()) { if (wp.isOwnerofWorld()) {
p.sendMessage(PluginConfig.getPrefix() + "§cYou are the owner"); p.sendMessage(PluginConfig.getPrefix() + "§cYou cannot disable building for yourself!");
return false; return false;
} }
if (wp.toggleBuild()) { if (wp.toggleBuild()) {

12
src/main/java/de/butzlabben/world/command/commands/WorldSettingsCommands.java
View File

@ -87,7 +87,7 @@ public class WorldSettingsCommands {
} }
} else { } else {
p.sendMessage(MessageConfig.getInvalidInput().replaceAll("input", args[1])); p.sendMessage(MessageConfig.getInvalidInput().replaceAll("%input", "\"reset " + args[1] + "\""));
} }
} else { } else {
if (sw.isLoaded()) if (sw.isLoaded())
@ -161,6 +161,11 @@ public class WorldSettingsCommands {
if (sender instanceof Player) { if (sender instanceof Player) {
Player p = (Player) sender; Player p = (Player) sender;
DependenceConfig dc = new DependenceConfig(p); DependenceConfig dc = new DependenceConfig(p);
if (!dc.hasWorld()) {
p.sendMessage(MessageConfig.getNoWorldOwn());
return false;
}
WorldConfig wc = WorldConfig.getWorldConfig(dc.getWorldname()); WorldConfig wc = WorldConfig.getWorldConfig(dc.getWorldname());
boolean tnt = wc.isTnt(); boolean tnt = wc.isTnt();
WorldToggleTntEvent event = new WorldToggleTntEvent(p, SystemWorld.getSystemWorld(dc.getWorldname()), tnt); WorldToggleTntEvent event = new WorldToggleTntEvent(p, SystemWorld.getSystemWorld(dc.getWorldname()), tnt);
@ -192,6 +197,11 @@ public class WorldSettingsCommands {
if (sender instanceof Player) { if (sender instanceof Player) {
Player p = (Player) sender; Player p = (Player) sender;
DependenceConfig dc = new DependenceConfig(p); DependenceConfig dc = new DependenceConfig(p);
if (!dc.hasWorld()) {
p.sendMessage(MessageConfig.getNoWorldOwn());
return false;
}
WorldConfig wc = WorldConfig.getWorldConfig(dc.getWorldname()); WorldConfig wc = WorldConfig.getWorldConfig(dc.getWorldname());
boolean fire = wc.isFire(); boolean fire = wc.isFire();
WorldToggleFireEvent event = new WorldToggleFireEvent(p, SystemWorld.getSystemWorld(dc.getWorldname()), fire); WorldToggleFireEvent event = new WorldToggleFireEvent(p, SystemWorld.getSystemWorld(dc.getWorldname()), fire);

2
src/main/java/de/butzlabben/world/config/MessageConfig.java
View File

@ -264,7 +264,7 @@ public class MessageConfig {
} }
public static String getDeleteCommandHelp() { public static String getDeleteCommandHelp() {
return getMessage("command_help.delete_command", "/ws delete §8- §7Will delete a World"); return getRawMessage("command_help.delete_command", "/ws delete §8- §7Will delete a World");
} }
public static List<String> getCommandHelp() { public static List<String> getCommandHelp() {