JaTiTV/T2C-CommandGUI
JaTiTV/T2C-CommandGUI
1
0
Fork 0
Code Issues 5 Pull Requests Projects 1 Releases 36 Activity

Merge pull request '2.5.19' (#4) from world-black-/-whitelist into main

Browse Source 
Reviewed-on: JaTiTV/CommandGUI#4
This commit is contained in:
JaTiTV 2022-01-07 20:43:37 +01:00
commit cb5f8a7350
2 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CommandGUI V2/src/main/java/de/jatitv/commandguiv2/Bungee/BUpdateChecker.java
View File

@ -27,7 +27,7 @@ public class BUpdateChecker {
public static void sendUpdateMsg(String Prefix, String foundVersion, String update_version) { public static void sendUpdateMsg(String Prefix, String foundVersion, String update_version) {
Bsend.console("§4=========== " + Prefix + " §4==========="); Bsend.console("§4=========== " + Prefix + " §4===========");
Bsend.console("§6A new version was found!"); Bsend.console("§6A new version was found!");
Bsend.console("§6Your version: §c" + foundVersion + " §7- §6Current version: §a" + update_version+"_Bungee"); Bsend.console("§6Your version: §c" + foundVersion + " §7- §6Current version: §a" + update_version);
Bsend.console("§6You can download it here: §e" + BMain.spigot); Bsend.console("§6You can download it here: §e" + BMain.spigot);
Bsend.console("§6You can find more information on Discord: §e" + BMain.discord); Bsend.console("§6You can find more information on Discord: §e" + BMain.discord);
Bsend.console("§4=========== " + Prefix + " §4==========="); Bsend.console("§4=========== " + Prefix + " §4===========");

10
CommandGUI V2/src/main/java/de/jatitv/commandguiv2/Spigot/Listener/UseItem_Listener/Events.java
View File

@ -160,26 +160,24 @@ public class Events implements Listener {
if (SelectConfig.UseItemGameModeProtection) { if (SelectConfig.UseItemGameModeProtection) {
if (SelectConfig.UseItemGameModeMode.equalsIgnoreCase("blacklist") && SelectConfig.UseItemGameModeList.contains(p.getGameMode().toString())) { if (SelectConfig.UseItemGameModeMode.equalsIgnoreCase("blacklist") && SelectConfig.UseItemGameModeList.contains(p.getGameMode().toString())) {
e.setCancelled(true); e.setCancelled(true);
send.player(p,SelectMessages.UseItemDisabledInGameMode); send.player(p, SelectMessages.UseItemDisabledInGameMode);
return; return;
} }
if (SelectConfig.UseItemGameModeMode.equalsIgnoreCase("whitelist") && !SelectConfig.UseItemGameModeList.contains(p.getGameMode().toString())) { if (SelectConfig.UseItemGameModeMode.equalsIgnoreCase("whitelist") && !SelectConfig.UseItemGameModeList.contains(p.getGameMode().toString())) {
e.setCancelled(true); e.setCancelled(true);
send.player(p,SelectMessages.UseItemDisabledInGameMode); send.player(p, SelectMessages.UseItemDisabledInGameMode);
return; return;
} }
} }
send.debugmsg(Main.plugin,SelectConfig.UseItemWorldList.toString());
send.debugmsg(Main.plugin,p.getWorld().getName());
if (SelectConfig.UseItemWorldProtection) { if (SelectConfig.UseItemWorldProtection) {
if (SelectConfig.UseItemWorldMode.equalsIgnoreCase("blacklist") && SelectConfig.UseItemWorldList.contains(p.getWorld().getName())) { if (SelectConfig.UseItemWorldMode.equalsIgnoreCase("blacklist") && SelectConfig.UseItemWorldList.contains(p.getWorld().getName())) {
e.setCancelled(true); e.setCancelled(true);
send.player(p,SelectMessages.UseItemDisabledInWorld); send.player(p, SelectMessages.UseItemDisabledInWorld);
return; return;
} }
if (SelectConfig.UseItemWorldMode.equalsIgnoreCase("whitelist") && !SelectConfig.UseItemWorldList.contains(p.getWorld().getName())) { if (SelectConfig.UseItemWorldMode.equalsIgnoreCase("whitelist") && !SelectConfig.UseItemWorldList.contains(p.getWorld().getName())) {
e.setCancelled(true); e.setCancelled(true);
send.player(p,SelectMessages.UseItemDisabledInWorld); send.player(p, SelectMessages.UseItemDisabledInWorld);
return; return;
} }
} }