add null check in network manager (null packets are not our problem)

also add mech input check for spell
DenizenScript · Dec 4, 2023 · 472aab5 · 472aab5
1 parent 7aeab78
commit 472aab5
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 0 deletions.
diff --git a/plugin/src/main/java/com/denizenscript/denizen/objects/properties/entity/EntitySpell.java b/plugin/src/main/java/com/denizenscript/denizen/objects/properties/entity/EntitySpell.java
@@ -28,6 +28,9 @@ public ElementTag getPropertyValue() {
 
     @Override
     public void setPropertyValue(ElementTag param, Mechanism mechanism) {
+        if (!mechanism.requireEnum(Spellcaster.Spell.class)) {
+            return;
+        }
         Spellcaster.Spell spell = param.asEnum(Spellcaster.Spell.class);
         if (object.isCitizensNPC()) {
             object.getDenizenNPC().getCitizen().getOrAddTrait(SpellcasterTrait.class).setSpell(spell);

diff --git a/.../com/denizenscript/denizen/nms/v1_20/impl/network/handlers/DenizenNetworkManagerImpl.java b/.../com/denizenscript/denizen/nms/v1_20/impl/network/handlers/DenizenNetworkManagerImpl.java
@@ -356,6 +356,9 @@ public void flushChannel() {
     }
 
     public Packet<ClientGamePacketListener> processPacketHandlersFor(Packet<ClientGamePacketListener> packet) {
+        if (packet == null) {
+            return null;
+        }
         List<PacketHandler<?>> packetHandlers = DenizenNetworkManagerImpl.packetHandlers.get(packet.getClass());
         if (packetHandlers != null) {
             for (PacketHandler<?> _packetHandler : packetHandlers) {