Skip to content

Commit 6c7a335

Browse files
authored
Merge branch 'main' into dependabot/gradle/it.unimi.dsi-fastutil-8.5.18
2 parents bbe0b97 + e8eb135 commit 6c7a335

24 files changed

Lines changed: 4776 additions & 4776 deletions

src/main/java/tf/tuff/NetworkListener.java

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -9,24 +9,24 @@
99

1010
public class NetworkListener implements PacketListener {
1111

12-
private final TuffX plugin;
12+
private final TuffX plugin;
1313

14-
public NetworkListener(TuffX plugin) {
15-
this.plugin = plugin;
16-
}
14+
public NetworkListener(TuffX plugin) {
15+
this.plugin = plugin;
16+
}
1717

18-
@Override
19-
public void onPacketSend(PacketSendEvent event) {
20-
if (event.getPacketType() == PacketType.Play.Server.CHUNK_DATA) {
21-
Player player = (Player) event.getPlayer();
22-
if (player == null) return;
18+
@Override
19+
public void onPacketSend(PacketSendEvent event) {
20+
if (event.getPacketType() == PacketType.Play.Server.CHUNK_DATA) {
21+
Player player = (Player) event.getPlayer();
22+
if (player == null) return;
2323

24-
WrapperPlayServerChunkData wrapper = new WrapperPlayServerChunkData(event);
25-
int chunkX = wrapper.getColumn().getX();
26-
int chunkZ = wrapper.getColumn().getZ();
24+
WrapperPlayServerChunkData wrapper = new WrapperPlayServerChunkData(event);
25+
int chunkX = wrapper.getColumn().getX();
26+
int chunkZ = wrapper.getColumn().getZ();
2727

28-
World world = player.getWorld();
29-
plugin.y0Plugin.chunkPacketListener.handleChunk(plugin, player, world, chunkX, chunkZ);
30-
}
31-
}
28+
World world = player.getWorld();
29+
plugin.y0Plugin.chunkPacketListener.handleChunk(plugin, player, world, chunkX, chunkZ);
30+
}
31+
}
3232
}

src/main/java/tf/tuff/ServerRegistry.java

Lines changed: 49 additions & 49 deletions
Original file line numberDiff line numberDiff line change
@@ -8,61 +8,61 @@
88
import tf.tuff.util.SchedulerCompat;
99

1010
public class ServerRegistry {
11-
private final JavaPlugin p;
12-
private final String wsUrl;
13-
private final String server;
14-
private WebSocketClient client;
15-
private volatile boolean running = true;
11+
private final JavaPlugin p;
12+
private final String wsUrl;
13+
private final String server;
14+
private WebSocketClient client;
15+
private volatile boolean running = true;
1616

17-
public ServerRegistry(JavaPlugin pl, String registryUrl, String serverAddr) {
18-
p = pl;
19-
wsUrl = registryUrl;
20-
server = serverAddr;
21-
}
17+
public ServerRegistry(JavaPlugin pl, String registryUrl, String serverAddr) {
18+
p = pl;
19+
wsUrl = registryUrl;
20+
server = serverAddr;
21+
}
2222

23-
public void connect() {
24-
SchedulerCompat.runAsync(p, this::doConnect);
25-
}
23+
public void connect() {
24+
SchedulerCompat.runAsync(p, this::doConnect);
25+
}
2626

27-
private void doConnect() {
28-
if (!running)
29-
return;
27+
private void doConnect() {
28+
if (!running)
29+
return;
3030

31-
try {
32-
client = new WebSocketClient(new URI(wsUrl)) {
33-
@Override
34-
public void onOpen(ServerHandshake h) {
35-
send("{\"type\":\"register\",\"server\":\"" + server + "\"}");
36-
}
31+
try {
32+
client = new WebSocketClient(new URI(wsUrl)) {
33+
@Override
34+
public void onOpen(ServerHandshake h) {
35+
send("{\"type\":\"register\",\"server\":\"" + server + "\"}");
36+
}
3737

38-
@Override
39-
public void onMessage(String msg) {
40-
}
38+
@Override
39+
public void onMessage(String msg) {
40+
}
4141

42-
@Override
43-
public void onClose(int code, String reason, boolean remote) {
44-
if (running) {
45-
SchedulerCompat.runAsyncLater(p, ServerRegistry.this::doConnect, 100L);
46-
}
47-
}
42+
@Override
43+
public void onClose(int code, String reason, boolean remote) {
44+
if (running) {
45+
SchedulerCompat.runAsyncLater(p, ServerRegistry.this::doConnect, 100L);
46+
}
47+
}
4848

49-
@Override
50-
public void onError(Exception e) {
51-
}
52-
};
53-
client.setConnectionLostTimeout(30);
54-
client.connect();
55-
} catch (Exception e) {
56-
if (running) {
57-
SchedulerCompat.runAsyncLater(p, this::doConnect, 100L);
58-
}
59-
}
60-
}
49+
@Override
50+
public void onError(Exception e) {
51+
}
52+
};
53+
client.setConnectionLostTimeout(30);
54+
client.connect();
55+
} catch (Exception e) {
56+
if (running) {
57+
SchedulerCompat.runAsyncLater(p, this::doConnect, 100L);
58+
}
59+
}
60+
}
6161

62-
public void disconnect() {
63-
running = false;
64-
if (client != null) {
65-
client.close();
66-
}
67-
}
62+
public void disconnect() {
63+
running = false;
64+
if (client != null) {
65+
client.close();
66+
}
67+
}
6868
}

0 commit comments

Comments
 (0)