From 4b56f9b80f24cc51f38fb1a06b68a6712a8da0ad Mon Sep 17 00:00:00 2001 From: ChomeNS <95471003+ChomeNS@users.noreply.github.com> Date: Wed, 25 Oct 2023 20:37:14 +0700 Subject: [PATCH] this does fuck --- .../chayapak/chomens_bot/plugins/SelfCarePlugin.java | 8 +++++--- .../chipmunk/chayapak/chomens_bot/plugins/TagPlugin.java | 2 ++ 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/src/main/java/land/chipmunk/chayapak/chomens_bot/plugins/SelfCarePlugin.java b/src/main/java/land/chipmunk/chayapak/chomens_bot/plugins/SelfCarePlugin.java index 7ab4ebc..4540ffe 100644 --- a/src/main/java/land/chipmunk/chayapak/chomens_bot/plugins/SelfCarePlugin.java +++ b/src/main/java/land/chipmunk/chayapak/chomens_bot/plugins/SelfCarePlugin.java @@ -91,6 +91,8 @@ public class SelfCarePlugin extends Bot.Listener { final boolean kaboom = bot.serverPluginsManager.hasPlugin(ServerPluginsManagerPlugin.EXTRAS); final boolean hasEssentials = bot.serverPluginsManager.hasPlugin(ServerPluginsManagerPlugin.ESSENTIALS); + final boolean creayun = bot.options.creayun; + // chat only if (selfCares.op && permissionLevel < 2) bot.chat.send("/minecraft:op @s[type=player]"); else if (selfCares.gamemode && gamemode != GameMode.CREATIVE && !bot.options.creayun) bot.chat.send("/minecraft:gamemode creative @s[type=player]"); @@ -103,16 +105,16 @@ public class SelfCarePlugin extends Bot.Listener { else if (hasEssentials) { // TODO: improve lol, this is ohio - if (selfCares.vanish && !vanish && !visibility) { + if (selfCares.vanish && !vanish && !visibility && !creayun) { if (bot.options.useChat) bot.chat.sendCommandInstantly("essentials:vanish enable"); else bot.core.run("essentials:vanish " + bot.username + " enable"); } else if (selfCares.nickname && !nickname) { if (bot.options.useChat) bot.chat.sendCommandInstantly("essentials:nick off"); else bot.core.run("essentials:nickname " + bot.username + " off"); - } else if (selfCares.socialspy && !socialspy) { + } else if (selfCares.socialspy && !socialspy && !creayun) { if (bot.options.useChat) bot.chat.sendCommandInstantly("essentials:socialspy enable"); else bot.core.run("essentials:socialspy " + bot.username + " enable"); - } else if (selfCares.mute && muted) { + } else if (selfCares.mute && muted && !creayun) { if (bot.options.useChat) bot.chat.sendCommandInstantly("essentials:mute " + bot.profile.getIdAsString()); else bot.core.run("essentials:mute " + bot.profile.getIdAsString()); diff --git a/src/main/java/land/chipmunk/chayapak/chomens_bot/plugins/TagPlugin.java b/src/main/java/land/chipmunk/chayapak/chomens_bot/plugins/TagPlugin.java index 46da925..2e6cb49 100644 --- a/src/main/java/land/chipmunk/chayapak/chomens_bot/plugins/TagPlugin.java +++ b/src/main/java/land/chipmunk/chayapak/chomens_bot/plugins/TagPlugin.java @@ -17,6 +17,8 @@ public class TagPlugin extends CorePlugin.Listener { } private void runCommand () { + if (!bot.serverPluginsManager.hasPlugin(ServerPluginsManagerPlugin.EXTRAS)) return; + final String botSelector = UUIDUtilities.selector(bot.profile.getId()); bot.core.run("minecraft:tag " + botSelector + " add " + tag);