AtlasMediaGroup
/
TotalFreedomMod
mirror of https://github.com/AtlasMediaGroup/TotalFreedomMod.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'development' into paldiu-local

This commit is contained in:
Ryan 2020-12-28 22:51:44 +00:00 committed by GitHub
parent d71f5452ad 91dc89013c
commit fd725ca6c5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 14 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
pom.xml
View File

@ -114,11 +114,6 @@
<id>ess-repo</id>
<url>https://ci.ender.zone/plugin/repository/everything/</url>
</repository>
<repository>
<id>telesphoreo-repo</id>
<url>https://telesphoreo.me/repo/maven/</url>
</repository>
</repositories>
<dependencies>
@ -145,16 +140,16 @@
</dependency>
<dependency>
<groupId>me.telesphoreo</groupId>
<artifactId>mojangson</artifactId>
<version>1.0</version>
<groupId>com.github.speedxx</groupId>
<artifactId>Mojangson</artifactId>
<version>1957eef8d6</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.bstats</groupId>
<artifactId>bstats-bukkit</artifactId>
<version>1.7</version>
<version>1.8</version>
<scope>compile</scope>
</dependency>
@ -196,7 +191,7 @@
<dependency>
<groupId>net.dv8tion</groupId>
<artifactId>JDA</artifactId>
<version>4.2.0_223</version>
<version>4.2.0_224</version>
<scope>provided</scope>
</dependency>
@ -442,7 +437,7 @@
<include>org.javassist:javassist</include>
<include>me.rayzr522:jsonmessage</include>
<include>io.papermc:paperlib</include>
<include>me.telesphoreo:mojangson</include>
<include>com.github.speedxx:Mojangson</include>
<include>org.bstats:bstats-bukkit</include>
</includes>
</artifactSet>

9
src/main/java/me/totalfreedom/totalfreedommod/command/Command_gcmd.java
View File

@ -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;
@ -32,6 +33,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 +59,4 @@ public class Command_gcmd extends FreedomCommand
return true;
}
}
}