TotalFreedomMC/TotalFreedomMod
1
0
Fork 0
mirror of https://github.com/TotalFreedomMC/TotalFreedomMod.git synced 2024-05-10 14:41:25 +00:00
Code Issues Projects Releases Wiki Activity

Fix all the bugs

Browse source
This commit is contained in:
Telesphoreo 2020-09-11 22:27:26 -05:00
parent d67189e170
commit 9cb96e81ac
10 changed files with 117 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
.idea/codeStyles/Project.xml
View file

@ -9,6 +9,24 @@
</value>
</option>
</JavaCodeStyleSettings>
<JetCodeStyleSettings>
<option name="PACKAGES_TO_USE_STAR_IMPORTS">
<value>
<package name="java.util" alias="false" withSubpackages="false" />
<package name="kotlinx.android.synthetic" alias="false" withSubpackages="true" />
<package name="io.ktor" alias="false" withSubpackages="true" />
</value>
</option>
<option name="PACKAGES_IMPORT_LAYOUT">
<value>
<package name="" alias="false" withSubpackages="true" />
<package name="java" alias="false" withSubpackages="true" />
<package name="javax" alias="false" withSubpackages="true" />
<package name="kotlin" alias="false" withSubpackages="true" />
<package name="" alias="true" withSubpackages="true" />
</value>
</option>
</JetCodeStyleSettings>
<codeStyleSettings language="JAVA">
<option name="BRACE_STYLE" value="2" />
<option name="CLASS_BRACE_STYLE" value="2" />

7
pom.xml
View file

@ -414,6 +414,12 @@
</goals>
<configuration>
<minimizeJar>true</minimizeJar>
<relocations>
<relocation>
<pattern>io.papermc.lib</pattern>
<shadedPattern>me.totalfreedom.totalfreedommod.paperlib</shadedPattern> <!-- Replace this -->
</relocation>
</relocations>
<artifactSet>
<includes>
<include>commons-io:commons-io</include>
@ -422,6 +428,7 @@
<include>org.reflections:reflections</include>
<include>javassist:javassist</include>
<include>me.rayzr522:jsonmessage</include>
<include>io.papermc:paperlib</include>
</includes>
</artifactSet>
</configuration>

2
src/main/java/me/totalfreedom/totalfreedommod/Monitors.java
View file

@ -47,7 +47,7 @@ public class Monitors extends FreedomService
}
}
plugin.sl.messageAllStaff(ChatColor.translateAlternateColorCodes('&', String.format("&8[&ePotionSpy&8] &r%s splashed %s %s at X: %s Y: %s Z: %s in the world '%s'%s.",
plugin.sl.potionSpyMessage(ChatColor.translateAlternateColorCodes('&', String.format("&8[&ePotionSpy&8] &r%s splashed %s %s at X: %s Y: %s Z: %s in the world '%s'%s.",
player.getName(), potionsThrown, potionsThrown == 1 ? "potion" : "potions", latestThrownPotion.getLocation().getBlockX(), latestThrownPotion.getLocation().getBlockY(), latestThrownPotion.getLocation().getBlockZ(),
latestThrownPotion.getWorld().getName(), trollPotions > 0 ? String.format(" &c(most likely troll %s)", trollPotions == 1 ? "potion" : "potions") : "")));
}

8
src/main/java/me/totalfreedom/totalfreedommod/command/Command_list.java
View file

@ -82,15 +82,15 @@ public class Command_list extends FreedomCommand
List<String> n = new ArrayList<>();
if (listFilter == ListFilter.TELNET_SESSIONS && plugin.sl.isStaff(sender) && plugin.sl.getAdmin(sender).getRank().isAtLeast(Rank.MOD))
if (listFilter == ListFilter.TELNET_SESSIONS && plugin.sl.isStaff(sender) && plugin.sl.getAdmin(playerSender).getRank().isAtLeast(Rank.MOD))
{
List<StaffMember> connectedStaffMembers = plugin.btb.getConnectedAdmins();
onlineStats.append(ChatColor.BLUE).append("There are ").append(ChatColor.RED).append(connectedStaffMembers.size())
.append(ChatColor.BLUE)
.append(" staff connected to telnet.");
.append(" staff members connected to telnet.");
for (StaffMember staffMember : connectedStaffMembers)
{
n.add(plugin.rm.getDisplay(staffMember).getColoredTag() + staffMember.getName());
n.add(staffMember.getName());
}
}
else
@ -139,13 +139,11 @@ public class Command_list extends FreedomCommand
.append(": ")
.append(StringUtils.join(n, ChatColor.WHITE + ", "));
if (senderIsConsole)
{
sender.sendMessage(ChatColor.stripColor(onlineStats.toString()));
sender.sendMessage(ChatColor.stripColor(onlineUsers.toString()));
}
else
{
sender.sendMessage(onlineStats.toString());
sender.sendMessage(onlineUsers.toString());

2
src/main/java/me/totalfreedom/totalfreedommod/command/Command_setlimit.java
View file

@ -19,7 +19,7 @@ public class Command_setlimit extends FreedomCommand
{
try
{
amount = Math.max(1, Math.min(plugin.web.getMaxLimit(), Integer.parseInt(args[0])));
amount = Math.max(-1, Math.min(plugin.web.getMaxLimit(), Integer.parseInt(args[0])));
}
catch (NumberFormatException ex)
{

66
src/main/java/me/totalfreedom/totalfreedommod/command/Command_setplayerlimit.java Normal file
View file

@ -0,0 +1,66 @@
package me.totalfreedom.totalfreedommod.command;
import me.totalfreedom.totalfreedommod.rank.Rank;
import me.totalfreedom.totalfreedommod.util.FUtil;
import org.bukkit.Bukkit;
import org.bukkit.ChatColor;
import org.bukkit.command.Command;
import org.bukkit.command.CommandSender;
import org.bukkit.entity.Player;
@CommandPermissions(level = Rank.TRIAL_MOD, source = SourceType.BOTH)
@CommandParameters(description = "Sets a specific player's WorldEdit block modification limit to the default limit or to a custom limit.", usage = "/<command> <player> [limit]", aliases = "setpl,spl")
public class Command_setplayerlimit extends FreedomCommand
{
@Override
public boolean run(CommandSender sender, Player playerSender, Command cmd, String commandLabel, String[] args, boolean senderIsConsole)
{
int amount;
if (args.length > 0)
{
Player player = Bukkit.getPlayer(args[0]);
if (player == null)
{
sender.sendMessage(PLAYER_NOT_FOUND);
return true;
}
if (args.length == 2)
{
try
{
amount = Math.max(-1, Math.min(plugin.web.getMaxLimit(), Integer.parseInt(args[1])));
}
catch (NumberFormatException ex)
{
msg("Invalid number: " + args[1], ChatColor.RED);
return true;
}
}
else
{
amount = plugin.web.getDefaultLimit();
}
}
else
{
return false;
}
boolean success = false;
Player player = Bukkit.getPlayer(args[0]);
try
{
plugin.web.setLimit(player, amount);
success = true;
}
catch (NoClassDefFoundError | NullPointerException ex)
{
msg("WorldEdit is not enabled on this server.");
}
if (success)
{
FUtil.staffAction(sender.getName(), "Setting " + player.getName() + "'s WorldEdit block modification limit to " + amount + ".", true);
}
return true;
}
}

1
src/main/java/me/totalfreedom/totalfreedommod/rank/RankManager.java
View file

@ -1,5 +1,6 @@
package me.totalfreedom.totalfreedommod.rank;
import me.libraryaddict.disguise.DisguiseAPI;
import me.totalfreedom.totalfreedommod.FreedomService;
import me.totalfreedom.totalfreedommod.config.ConfigEntry;
import me.totalfreedom.totalfreedommod.player.FPlayer;

12
src/main/java/me/totalfreedom/totalfreedommod/sql/SQLite.java
View file

@ -233,7 +233,7 @@ public class SQLite extends FreedomService
}
else if (value instanceof Boolean)
{
result = resultSet.getBoolean(key);
result = resultSet.getObject(key);
}
else if (value instanceof Long)
{
@ -261,7 +261,7 @@ public class SQLite extends FreedomService
}
catch (SQLException e)
{
FLog.severe("Failed to add staff member: " + e.getMessage());
FLog.severe("Failed to add staff member: " + e);
}
}
@ -289,7 +289,7 @@ public class SQLite extends FreedomService
}
catch (SQLException e)
{
FLog.severe("Failed to add player: " + e.getMessage());
FLog.severe("Failed to add player: " + e);
}
}
@ -305,7 +305,7 @@ public class SQLite extends FreedomService
}
catch (SQLException e)
{
FLog.severe("Failed to get staff member by name: " + e.getMessage());
FLog.severe("Failed to get staff member by name: " + e);
}
return null;
@ -323,7 +323,7 @@ public class SQLite extends FreedomService
}
catch (SQLException e)
{
FLog.severe("Failed to get player by name: " + e.getMessage());
FLog.severe("Failed to get player by name: " + e);
}
return null;
@ -337,7 +337,7 @@ public class SQLite extends FreedomService
}
catch (SQLException e)
{
FLog.severe("Failed to get Master Builders: " + e.getMessage());
FLog.severe("Failed to get Master Builders: " + e);
}
return null;

12
src/main/java/me/totalfreedom/totalfreedommod/staff/StaffList.java
View file

@ -79,6 +79,18 @@ public class StaffList extends FreedomService
}
}
public void potionSpyMessage(String message)
{
for (Player player : server.getOnlinePlayers())
{
StaffMember staffMember = getAdmin(player.getPlayer());
if (isStaff(player) && staffMember.getPotionSpy())
{
player.sendMessage(message);
}
}
}
public synchronized boolean isStaffSync(CommandSender sender)
{
return isStaff(sender);

4
src/main/java/me/totalfreedom/totalfreedommod/util/FUtil.java
View file

@ -7,6 +7,7 @@ import java.io.FileFilter;
import java.io.IOException;
import java.io.InputStreamReader;
import java.lang.reflect.Field;
import java.net.HttpURLConnection;
import java.net.URL;
import java.text.ParseException;
import java.text.SimpleDateFormat;
@ -26,7 +27,6 @@ import java.util.TimeZone;
import java.util.UUID;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
import javax.net.ssl.HttpsURLConnection;
import me.totalfreedom.totalfreedommod.TotalFreedomMod;
import me.totalfreedom.totalfreedommod.config.ConfigEntry;
import org.apache.commons.io.FileUtils;
@ -257,7 +257,7 @@ public class FUtil
public static String sendRequest(String endpoint, String method, List<String>headers, String body) throws IOException
{
URL url = new URL(endpoint);
HttpsURLConnection connection = (HttpsURLConnection)url.openConnection();
HttpURLConnection connection = (HttpURLConnection)url.openConnection();
connection.setRequestMethod(method);
for (String header : headers)
{