diff options
| author | Matthew <pugmatt@gmail.com> | 2022-08-09 19:55:15 -0400 |
|---|---|---|
| committer | Matthew <pugmatt@gmail.com> | 2022-08-09 19:55:15 -0400 |
| commit | d7fb03e678f957ca7594b974dc2d85c6dd9cf70f (patch) | |
| tree | cbf1219ea011e717b02ab472314f404f4f287e45 | |
| parent | 93e91a83a8e2d64453898846d06f5615312e46bd (diff) | |
| download | BedrockConnect-d7fb03e678f957ca7594b974dc2d85c6dd9cf70f.tar.gz BedrockConnect-d7fb03e678f957ca7594b974dc2d85c6dd9cf70f.tar.bz2 BedrockConnect-d7fb03e678f957ca7594b974dc2d85c6dd9cf70f.zip | |
Fix NullPointerException
| -rw-r--r-- | serverlist-server/pom.xml | 8 | ||||
| -rw-r--r-- | serverlist-server/src/main/com/pyratron/pugmatt/bedrockconnect/listeners/PacketHandler.java | 16 |
2 files changed, 16 insertions, 8 deletions
diff --git a/serverlist-server/pom.xml b/serverlist-server/pom.xml index 1934d24..35a8363 100644 --- a/serverlist-server/pom.xml +++ b/serverlist-server/pom.xml @@ -63,6 +63,14 @@ <id>opencollab-repo</id> <url>https://repo.opencollab.dev/snapshot</url> </repository> + <repository> + <id>nukkitx-repo-release</id> + <url>https://repo.nukkitx.com/maven-releases/</url> + </repository> + <repository> + <id>nukkitx-repo-snapshot</id> + <url>https://repo.nukkitx.com/maven-snapshots/</url> + </repository> </repositories> <distributionManagement> diff --git a/serverlist-server/src/main/com/pyratron/pugmatt/bedrockconnect/listeners/PacketHandler.java b/serverlist-server/src/main/com/pyratron/pugmatt/bedrockconnect/listeners/PacketHandler.java index c8b716b..b10a4d2 100644 --- a/serverlist-server/src/main/com/pyratron/pugmatt/bedrockconnect/listeners/PacketHandler.java +++ b/serverlist-server/src/main/com/pyratron/pugmatt/bedrockconnect/listeners/PacketHandler.java @@ -92,7 +92,7 @@ public class PacketHandler implements BedrockPacketHandler { switch (packet.getFormId()) { case UIForms.MAIN: // Re-open window if closed - if (packet.getFormData().contains("null")) { + if (packet.getFormData() == null || packet.getFormData().contains("null")) { if(player.getCurrentForm() != packet.getFormId()) return false; player.openForm(UIForms.MAIN); @@ -169,7 +169,7 @@ public class PacketHandler implements BedrockPacketHandler { } break; case UIForms.SERVER_GROUP: - if(packet.getFormData().contains("null")) { + if(packet.getFormData() == null || packet.getFormData().contains("null")) { if(player.getCurrentForm() != packet.getFormId()) return false; player.openForm(UIForms.MAIN); @@ -189,7 +189,7 @@ public class PacketHandler implements BedrockPacketHandler { } break; case UIForms.MANAGE_SERVER: - if(packet.getFormData().contains("null")) { + if(packet.getFormData() == null || packet.getFormData().contains("null")) { if(player.getCurrentForm() != packet.getFormId()) return false; player.openForm(UIForms.MAIN); @@ -214,7 +214,7 @@ public class PacketHandler implements BedrockPacketHandler { break; case UIForms.ADD_SERVER: try { - if(packet.getFormData().contains("null")) { + if(packet.getFormData() == null || packet.getFormData().contains("null")) { if(player.getCurrentForm() != packet.getFormId()) return false; player.openForm(UIForms.MANAGE_SERVER); @@ -242,7 +242,7 @@ public class PacketHandler implements BedrockPacketHandler { break; case UIForms.DIRECT_CONNECT: try { - if(packet.getFormData().contains("null")) { + if(packet.getFormData() == null || packet.getFormData().contains("null")) { if(player.getCurrentForm() != packet.getFormId()) return false; player.openForm(UIForms.MAIN); @@ -274,7 +274,7 @@ public class PacketHandler implements BedrockPacketHandler { } break; case UIForms.EDIT_CHOOSE_SERVER: - if(packet.getFormData().contains("null")) { + if(packet.getFormData() == null || packet.getFormData().contains("null")) { if(player.getCurrentForm() != packet.getFormId()) return false; player.openForm(UIForms.MANAGE_SERVER); @@ -300,7 +300,7 @@ public class PacketHandler implements BedrockPacketHandler { } break; case UIForms.EDIT_SERVER: - if(packet.getFormData().contains("null")) { + if(packet.getFormData() == null || packet.getFormData().contains("null")) { if(player.getCurrentForm() != packet.getFormId()) return false; player.openForm(UIForms.EDIT_CHOOSE_SERVER); @@ -331,7 +331,7 @@ public class PacketHandler implements BedrockPacketHandler { break; case UIForms.REMOVE_SERVER: try { - if(packet.getFormData().contains("null")) { + if(packet.getFormData() == null || packet.getFormData().contains("null")) { if(player.getCurrentForm() != packet.getFormId()) return false; player.openForm(UIForms.MANAGE_SERVER); |