BLOCKFANTASY
/
LOOHP-Limbo
Template
mirror of https://github.com/LOOHP/Limbo.git
1
0
Fork 1
Code Issues Packages Projects Releases Wiki Activity

Updated to 1.16.5

This commit is contained in:
LOOHP 2021-01-16 11:08:43 +08:00
parent 1040e75ca9
commit aeac3730ac
4 changed files with 15 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pom.xml
View File

@ -51,7 +51,7 @@
</configuration>
</plugin>
</plugins>
<finalName>${project.artifactId}-${project.version}-1.16.4</finalName>
<finalName>${project.artifactId}-${project.version}-1.16.5</finalName>
</build>
<repositories>

2
src/main/java/com/loohp/limbo/Limbo.java
View File

@ -104,7 +104,7 @@ public class Limbo {
//===========================
public final String serverImplementationVersion = "1.16.4";
public final String serverImplementationVersion = "1.16.5";
public final int serverImplmentationProtocol = 754;
public final String limboImplementationVersion;

27
src/main/java/com/loohp/limbo/Server/ClientConnection.java
View File

@ -13,6 +13,7 @@ import java.util.Optional;
import java.util.Set;
import java.util.UUID;
import java.util.concurrent.TimeUnit;
import java.util.concurrent.atomic.AtomicLong;
import java.util.stream.Collectors;
import com.loohp.limbo.DeclareCommands;
@ -89,16 +90,17 @@ public class ClientConnection extends Thread {
private ClientState state;
private Player player;
private long lastKeepAlivePayLoad;
private AtomicLong lastKeepAlivePayLoad;
protected DataOutputStream output;
protected DataInputStream input;
private DataOutputStream output;
private DataInputStream input;
private InetAddress inetAddress;
public ClientConnection(Socket client_socket) {
this.client_socket = client_socket;
this.inetAddress = client_socket.getInetAddress();
this.lastKeepAlivePayLoad = new AtomicLong();
}
public InetAddress getInetAddress() {
@ -106,11 +108,11 @@ public class ClientConnection extends Thread {
}
public long getLastKeepAlivePayLoad() {
return lastKeepAlivePayLoad;
return lastKeepAlivePayLoad.get();
}
public void setLastKeepAlivePayLoad(long payLoad) {
this.lastKeepAlivePayLoad = payLoad;
this.lastKeepAlivePayLoad.set(payLoad);
}
public Player getPlayer() {
@ -129,19 +131,17 @@ public class ClientConnection extends Thread {
return running;
}
public void sendPacket(PacketOut packet) throws IOException {
public synchronized void sendPacket(PacketOut packet) throws IOException {
byte[] packetByte = packet.serializePacket();
DataTypeIO.writeVarInt(output, packetByte.length);
output.write(packetByte);
output.flush();
}
public void disconnect(BaseComponent[] reason) {
try {
PacketPlayOutDisconnect packet = new PacketPlayOutDisconnect(ComponentSerializer.toString(reason));
byte[] packetByte = packet.serializePacket();
DataTypeIO.writeVarInt(output, packetByte.length);
output.write(packetByte);
output.flush();
sendPacket(packet);
} catch (IOException e) {}
try {
client_socket.close();
@ -151,10 +151,7 @@ public class ClientConnection extends Thread {
public void disconnectDuringLogin(BaseComponent[] reason) {
try {
PacketLoginOutDisconnect packet = new PacketLoginOutDisconnect(ComponentSerializer.toString(reason));
byte[] packetByte = packet.serializePacket();
DataTypeIO.writeVarInt(output, packetByte.length);
output.write(packetByte);
output.flush();
sendPacket(packet);
} catch (IOException e) {}
try {
client_socket.close();
@ -420,7 +417,7 @@ public class ClientConnection extends Thread {
}
} else if (packetType.equals(PacketPlayInKeepAlive.class)) {
PacketPlayInKeepAlive alive = new PacketPlayInKeepAlive(input);
if (alive.getPayload() != lastKeepAlivePayLoad) {
if (alive.getPayload() != getLastKeepAlivePayLoad()) {
Limbo.getInstance().getConsole().sendMessage("Incorrect Payload recieved in KeepAlive packet for player " + player.getName());
break;
}

5
src/main/java/com/loohp/limbo/Server/KeepAliveSender.java
View File

@ -7,7 +7,6 @@ import java.util.concurrent.TimeUnit;
import com.loohp.limbo.Limbo;
import com.loohp.limbo.Server.ClientConnection.ClientState;
import com.loohp.limbo.Server.Packets.PacketPlayOutKeepAlive;
import com.loohp.limbo.Utils.DataTypeIO;
public class KeepAliveSender extends Thread {
@ -26,10 +25,8 @@ public class KeepAliveSender extends Thread {
if (client.getClientState().equals(ClientState.PLAY)) {
try {
PacketPlayOutKeepAlive packet = new PacketPlayOutKeepAlive(random.nextLong());
byte[] packetByte = packet.serializePacket();
DataTypeIO.writeVarInt(client.output, packetByte.length);
client.output.write(packetByte);
client.setLastKeepAlivePayLoad(packet.getPayload());
client.sendPacket(packet);
} catch (IOException ignore) {}
}
}