Fixed incorrect variable usage

This commit is contained in:
Anuken
2020-01-07 15:54:51 -05:00
parent 1f3bab5fa3
commit c183b2dac4
3 changed files with 11 additions and 5 deletions

View File

@@ -413,6 +413,12 @@ public class NetServer implements ApplicationListener{
if(player.isLocal){ if(player.isLocal){
player.sendMessage("[scarlet]Re-synchronizing as the host is pointless."); player.sendMessage("[scarlet]Re-synchronizing as the host is pointless.");
}else{ }else{
if(Time.timeSinceMillis(player.getInfo().lastSyncTime) < 1000 * 5){
player.sendMessage("[scarlet]You may only /sync every 5 seconds.");
return;
}
player.getInfo().lastSyncTime = Time.millis();
Call.onWorldDataBegin(player.con); Call.onWorldDataBegin(player.con);
netServer.sendWorldData(player); netServer.sendWorldData(player);
} }

View File

@@ -34,19 +34,19 @@ public class Administration{
if(player.getInfo().messageInfractions >= Config.messageSpamKick.num() && Config.messageSpamKick.num() != 0){ if(player.getInfo().messageInfractions >= Config.messageSpamKick.num() && Config.messageSpamKick.num() != 0){
player.con.kick("You have been kicked for spamming.", 1000 * 60 * 2); player.con.kick("You have been kicked for spamming.", 1000 * 60 * 2);
} }
player.lastText = message; player.getInfo().lastSentMessage = message;
return null; return null;
}else{ }else{
player.getInfo().messageInfractions = 0; player.getInfo().messageInfractions = 0;
} }
//prevent players from sending the same message twice in the span of 50 seconds //prevent players from sending the same message twice in the span of 50 seconds
if(message.equals(player.lastText) && Time.timeSinceMillis(player.getInfo().lastMessageTime) < 1000 * 50){ if(message.equals(player.getInfo().lastSentMessage) && Time.timeSinceMillis(player.getInfo().lastMessageTime) < 1000 * 50){
player.sendMessage("[scarlet]You may not send the same message twice."); player.sendMessage("[scarlet]You may not send the same message twice.");
return null; return null;
} }
player.lastText = message; player.getInfo().lastSentMessage = message;
player.getInfo().lastMessageTime = Time.millis(); player.getInfo().lastMessageTime = Time.millis();
} }
@@ -440,7 +440,7 @@ public class Administration{
public boolean banned, admin; public boolean banned, admin;
public long lastKicked; //last kicked time to expiration public long lastKicked; //last kicked time to expiration
public transient long lastMessageTime; public transient long lastMessageTime, lastSyncTime;
public transient String lastSentMessage; public transient String lastSentMessage;
public transient int messageInfractions; public transient int messageInfractions;

View File

@@ -1,3 +1,3 @@
org.gradle.daemon=true org.gradle.daemon=true
org.gradle.jvmargs=-Xms256m -Xmx1024m org.gradle.jvmargs=-Xms256m -Xmx1024m
archash=9f70d5a39a910bd855430d74e41d0b8753b47442 archash=dbdce4d5bfcf9d53dd21480c7d14e90a637eaa8e