Skip to content

Commit def9c6c

Browse files
author
nazrin
committed
Small changes
1 parent 6b00035 commit def9c6c

File tree

11 files changed

+13
-143
lines changed

11 files changed

+13
-143
lines changed

src/java/smp/Main.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@
1010
import mindustry.net.Packets;
1111
import smp.commandSystem.CommandRegister;
1212
import smp.commandSystem.mindustry.MindustryCommand;
13-
import smp.system.config.ConfigSystem;
1413

1514
import java.util.List;
1615

@@ -62,7 +61,7 @@ public void init() {
6261
}
6362
Vars.net.handleServer(Packets.Connect.class, (con, connect) -> {
6463
Events.fire(new EventType.ConnectionEvent(con));
65-
CheckPlayerIP(con);
64+
checkPlayerIP(con);
6665

6766
if (netServer.admins.isIPBanned(connect.addressTCP) || netServer.admins.isSubnetBanned(connect.addressTCP)){
6867
con.kick(Packets.KickReason.banned);

src/java/smp/commandSystem/commands/discord/basic/ListRanksCommand.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,9 @@ public void run(MessageCreateEvent listener) {
1818
for (Rank rank : ranks){
1919
builder
2020
.append("Rank ID: ").append(rank.id).append("\n")
21-
.append("Rank Name: ").append(rank.name).append("\n")
22-
.append("Rank Prefix: ").append(rank.prefix).append("\n").append("\n");
21+
.append("Rank name: ").append(rank.name).append("\n")
22+
.append("Rank priority: ").append(rank.priotity).append("\n")
23+
.append("Rank prefix: ").append(rank.prefix).append("\n").append("\n");
2324

2425
}
2526
builder.append("```");

src/java/smp/commandSystem/commands/discord/basic/RenderCommand.java

Lines changed: 0 additions & 23 deletions
This file was deleted.

src/java/smp/commandSystem/commands/discord/console/MagicStickCommand.java

Lines changed: 0 additions & 36 deletions
This file was deleted.

src/java/smp/commandSystem/commands/mindustry/basic/ServerHopCommand.java

Lines changed: 0 additions & 16 deletions
This file was deleted.

src/java/smp/database/players/PlayerChecks.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
*/
2020

2121
public class PlayerChecks {
22-
public static void DisplayPlayerRank(String uuid) {
22+
public static void displayPlayerRank(String uuid) {
2323
Player eventPlayer = Groups.player.find(p -> p.uuid().contains(uuid));
2424

2525
if (eventPlayer == null) return;
@@ -37,7 +37,7 @@ public static void DisplayPlayerRank(String uuid) {
3737
}
3838
}
3939

40-
public static void CheckPlayerIP(NetConnection player){
40+
public static void checkPlayerIP(NetConnection player){
4141
PlayerData data = getPlayerDataByIP(player.address);
4242
if (data == null) {
4343
return;

src/java/smp/events/PlayerJoinEvent.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
import smp.menus.Menus.WelcomeMenu;
88
import smp.models.PlayerData;
99

10-
import static smp.database.players.PlayerChecks.DisplayPlayerRank;
10+
import static smp.database.players.PlayerChecks.displayPlayerRank;
1111
import static smp.database.players.PlayerFunctions.fillData;
1212
import static smp.database.players.PlayerFunctions.findPlayerDataOrCreate;
1313
import static smp.functions.Checks.kickIfBanned;
@@ -21,7 +21,7 @@ public static void joinEvent(Player plr){
2121
fillData(data, plr);
2222
kickIfBanned(plr);
2323
String joinMessage = data.joinMessage;
24-
DisplayPlayerRank(plr.uuid());
24+
displayPlayerRank(plr.uuid());
2525
Call.sendMessage(Strings.format(joinMessage + " [grey][" + data.id + "]", plr.name()));
2626
Log.info(plr.plainName() + " joined! " + "[" + data.id + "]");
2727
if (welcomeMenuEnabled) {

src/java/smp/other/BanSystem.java

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717

1818
import static mindustry.Vars.logic;
1919
import static mindustry.Vars.net;
20+
import static smp.vars.Variables.discordEnabled;
2021
import static smp.vars.Variables.discordURL;
2122
import static smp.database.DatabaseSystem.updateDatabaseDocument;
2223
import static smp.database.DatabaseSystem.playerCollection;
@@ -91,6 +92,8 @@ public static void banPlayer(Date date, String reason, PlayerData data, Player m
9192
plr.con.kick("[red]You have been banned!\n\n" + "[white]Reason: " + reason +"\nDuration: " + timeToDuration(date.getTime()) + " until unban\nIf you think this is a mistake, make sure to appeal ban in our discord: " + discordURL, 0);
9293
}
9394
updateDatabaseDocument(data, playerCollection, "_id", data.id);
94-
messageLogChannel.sendMessage(banEmbed(data, reason, date.getTime(), moderator.plainName()));
95+
if (discordEnabled) {
96+
messageLogChannel.sendMessage(banEmbed(data, reason, date.getTime(), moderator.plainName()));
97+
}
9598
}
9699
}

src/java/smp/render/Render.java

Lines changed: 0 additions & 54 deletions
This file was deleted.

src/java/smp/system/config/ConfigSystem.java

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,9 @@
11
package smp.system.config;
22

33
import arc.util.Log;
4-
import org.bson.json.JsonObject;
54
import org.json.simple.JSONObject;
65
import org.json.simple.parser.JSONParser;
76
import org.json.simple.parser.ParseException;
8-
import rhino.json.JsonParser;
97

108
import java.io.FileNotFoundException;
119
import java.io.FileReader;
@@ -48,7 +46,6 @@ public static void registerField(JSONObject object, String name){
4846
}
4947

5048
public static <T> T getConfigField(String name, HashMap<String, T> map){
51-
System.out.println("Got tha field: " + name + " = " + map.get(name));
5249
return map.get(name);
5350
}
5451

0 commit comments

Comments
 (0)