Skip to content

Commit 2077896

Browse files
committed
Remove packet info null-check and cleanup gradle
1 parent 0607163 commit 2077896

File tree

5 files changed

+10
-18
lines changed

5 files changed

+10
-18
lines changed

NetworkClient/build.gradle

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,9 @@ dependencies {
88
compileOnly group: 'org.bukkit', name: 'bukkit', version: '1.15.1-R0.1-SNAPSHOT'
99
}
1010

11+
/**
12+
* Temporary
13+
*/
1114
task copyJar {
1215
doLast {
1316
copy {

NetworkClient/src/main/java/org/mcservernetwork/client/util/inventory/NetworkOverviewPanel.java

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -5,19 +5,9 @@
55
import org.bukkit.event.inventory.InventoryOpenEvent;
66
import org.mcservernetwork.client.Client;
77
import org.mcservernetwork.commons.NetworkAPI;
8-
import org.mcservernetwork.commons.net.Sector;
98
import pl.socketbyte.opengui.GUI;
109
import pl.socketbyte.opengui.GUIExtender;
1110
import pl.socketbyte.opengui.Rows;
12-
import pl.socketbyte.opengui.event.WindowResponse;
13-
14-
import java.util.HashMap;
15-
import java.util.Map;
16-
import java.util.UUID;
17-
import java.util.concurrent.Executors;
18-
import java.util.concurrent.ScheduledExecutorService;
19-
import java.util.concurrent.ScheduledFuture;
20-
import java.util.concurrent.TimeUnit;
2111

2212
public class NetworkOverviewPanel extends GUIExtender {
2313

NetworkCommons/src/main/java/org/mcservernetwork/commons/net/Channel.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ public enum Channel {
44
TRANSFER_REQUEST, TRANSFER_ACCEPT,
55
PROXY,
66
LOGGER,
7-
TELEPORT,
87
STATUS,
98
VERIFY;
109
public static String sector(String name) {

NetworkProxy/build.gradle

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,11 @@ dependencies {
88
compileOnly group: 'net.md-5', name: 'bungeecord-api', version: '1.15-SNAPSHOT'
99
}
1010

11-
tasks.withType(Jar) {
12-
destinationDir = file("E:\\Sektory\\aProxy\\plugins\\")
11+
task copyJar {
12+
doLast {
13+
copy {
14+
from "$projectDir\\build\\libs\\NetworkProxy-1.0.jar"
15+
into "E:\\Sektory\\aProxy\\plugins"
16+
}
17+
}
1318
}

NetworkProxy/src/main/java/org/mcservernetwork/proxy/listener/TransferRequestListener.java

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -30,11 +30,6 @@ public void receive(PacketTransfer packet) {
3030
player.sendMessage(new TextComponent(
3131
ColorUtils.fixColors("&dConnecting to &l" + packet.targetSectorName + "&d...")));
3232
} else {
33-
if (packet.info == null) {
34-
player.disconnect(new TextComponent(
35-
ColorUtils.fixColors("&cCould not connect to &l" + packet.targetSectorName + "&c (Sector might be unavailable)")));
36-
return;
37-
}
3833
player.sendMessage(new TextComponent(
3934
ColorUtils.fixColors("&cCould not connect to &l" + packet.targetSectorName + "&c (Sector might be unavailable)")));
4035
}

0 commit comments

Comments
 (0)