Fix null player crashing server on join

Modflower · Sep 24, 2023 · 4378487 · 4378487
1 parent b55fb46
commit 4378487
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/gradle.properties b/gradle.properties
@@ -1,5 +1,5 @@
 # Project Specifics
-projectVersion=0.5.2
+projectVersion=0.5.3
 modrinthId=G9eJHDO2
 
 # Minecraft

diff --git a/src/main/java/gay/ampflower/polysit/SeatEntity.java b/src/main/java/gay/ampflower/polysit/SeatEntity.java
@@ -89,7 +89,13 @@ public void modifyRawTrackedData(List<DataTracker.SerializedEntry<?>> data, Serv
 		data.add(new DataTracker.Entry<>(ARMOR_STAND_FLAGS, (byte) 16).toSerialized());
 		// This must be manually sent as there's no other mechanism we can use to send
 		// this.
-		player.networkHandler.sendPacket(new EntityAttributesS2CPacket(getId(), MAX_HEALTH_NULL_SINGLE));
+		if (player != null) {
+			// Really, this shouldn't be null but apparently Polymer 0.3.13+1.19.3 is
+			// slightly busted in that joining a world while sitting on a seat causes an
+			// instant crash.
+			// We can at least mitigate it here.
+			player.networkHandler.sendPacket(new EntityAttributesS2CPacket(getId(), MAX_HEALTH_NULL_SINGLE));
+		}
 	}
 
 	@Override