From 402a6be5adb54c68c9800f1585878429c983d8a9 Mon Sep 17 00:00:00 2001 From: Elmon11 Date: Mon, 28 Dec 2020 00:04:57 +0100 Subject: [PATCH 1/4] Make gcmd not work on admins --- .../totalfreedommod/command/Command_gcmd.java | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_gcmd.java b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_gcmd.java index c0b007e4..7e42a1eb 100644 --- a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_gcmd.java +++ b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_gcmd.java @@ -32,6 +32,12 @@ public class Command_gcmd extends FreedomCommand { return true; } + + if (plugin.al.isAdmin(player)) + { + msg(ChatColor.RED + "You can not use gcmd on admins"); + return true; + } try { @@ -52,4 +58,4 @@ public class Command_gcmd extends FreedomCommand return true; } -} \ No newline at end of file +} From 0c60cbc739dbd82826440f834fedb8b0249c8369 Mon Sep 17 00:00:00 2001 From: Elmon11 Date: Mon, 28 Dec 2020 00:18:05 +0100 Subject: [PATCH 2/4] Update Command_gcmd.java --- .../me/totalfreedom/totalfreedommod/command/Command_gcmd.java | 1 + 1 file changed, 1 insertion(+) diff --git a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_gcmd.java b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_gcmd.java index 7e42a1eb..410fb8b4 100644 --- a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_gcmd.java +++ b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_gcmd.java @@ -3,6 +3,7 @@ package me.totalfreedom.totalfreedommod.command; import me.totalfreedom.totalfreedommod.rank.Rank; import org.apache.commons.lang3.StringUtils; import org.bukkit.command.Command; +import org.bukkit.ChatColor; import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; From 98158e0f27daa03c275a41db3317709032f9d69e Mon Sep 17 00:00:00 2001 From: speed <43330808+speedxx@users.noreply.github.com> Date: Mon, 28 Dec 2020 17:04:14 -0500 Subject: [PATCH 3/4] mojangson update --- pom.xml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pom.xml b/pom.xml index ebfad76c..2e20d2e8 100644 --- a/pom.xml +++ b/pom.xml @@ -151,16 +151,16 @@ - me.telesphoreo - mojangson - 1.0 + com.github.speedxx + Mojangson + 1957eef8d6 compile org.bstats bstats-bukkit - 1.7 + 1.8 compile @@ -202,7 +202,7 @@ net.dv8tion JDA - 4.2.0_223 + 4.2.0_224 provided @@ -448,7 +448,7 @@ org.javassist:javassist me.rayzr522:jsonmessage io.papermc:paperlib - me.telesphoreo:mojangson + com.github.speedxx:Mojangson org.bstats:bstats-bukkit From 5b8cf2798e54e5bb1703a94e4e5f9f68a6fa21e2 Mon Sep 17 00:00:00 2001 From: speed <43330808+speedxx@users.noreply.github.com> Date: Mon, 28 Dec 2020 17:05:52 -0500 Subject: [PATCH 4/4] Update pom.xml --- pom.xml | 5 ----- 1 file changed, 5 deletions(-) diff --git a/pom.xml b/pom.xml index 2e20d2e8..787362a0 100644 --- a/pom.xml +++ b/pom.xml @@ -114,11 +114,6 @@ ess-repo https://ci.ender.zone/plugin/repository/everything/ - - - telesphoreo-repo - https://telesphoreo.me/repo/maven/ -