Merge pull request '2.5.19' (#4) from world-black-/-whitelist into main
Reviewed-on: JaTiTV/CommandGUI#4
This commit is contained in:
commit
cb5f8a7350
@ -27,7 +27,7 @@ public class BUpdateChecker {
|
||||
public static void sendUpdateMsg(String Prefix, String foundVersion, String update_version) {
|
||||
Bsend.console("§4=========== " + Prefix + " §4===========");
|
||||
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 find more information on Discord: §e" + BMain.discord);
|
||||
Bsend.console("§4=========== " + Prefix + " §4===========");
|
||||
|
@ -160,26 +160,24 @@ public class Events implements Listener {
|
||||
if (SelectConfig.UseItemGameModeProtection) {
|
||||
if (SelectConfig.UseItemGameModeMode.equalsIgnoreCase("blacklist") && SelectConfig.UseItemGameModeList.contains(p.getGameMode().toString())) {
|
||||
e.setCancelled(true);
|
||||
send.player(p,SelectMessages.UseItemDisabledInGameMode);
|
||||
send.player(p, SelectMessages.UseItemDisabledInGameMode);
|
||||
return;
|
||||
}
|
||||
if (SelectConfig.UseItemGameModeMode.equalsIgnoreCase("whitelist") && !SelectConfig.UseItemGameModeList.contains(p.getGameMode().toString())) {
|
||||
e.setCancelled(true);
|
||||
send.player(p,SelectMessages.UseItemDisabledInGameMode);
|
||||
send.player(p, SelectMessages.UseItemDisabledInGameMode);
|
||||
return;
|
||||
}
|
||||
}
|
||||
send.debugmsg(Main.plugin,SelectConfig.UseItemWorldList.toString());
|
||||
send.debugmsg(Main.plugin,p.getWorld().getName());
|
||||
if (SelectConfig.UseItemWorldProtection) {
|
||||
if (SelectConfig.UseItemWorldMode.equalsIgnoreCase("blacklist") && SelectConfig.UseItemWorldList.contains(p.getWorld().getName())) {
|
||||
e.setCancelled(true);
|
||||
send.player(p,SelectMessages.UseItemDisabledInWorld);
|
||||
send.player(p, SelectMessages.UseItemDisabledInWorld);
|
||||
return;
|
||||
}
|
||||
if (SelectConfig.UseItemWorldMode.equalsIgnoreCase("whitelist") && !SelectConfig.UseItemWorldList.contains(p.getWorld().getName())) {
|
||||
e.setCancelled(true);
|
||||
send.player(p,SelectMessages.UseItemDisabledInWorld);
|
||||
send.player(p, SelectMessages.UseItemDisabledInWorld);
|
||||
return;
|
||||
}
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user