Apply suggestions

ViaVersion · Aug 21, 2024 · 40dd812 · 40dd812
1 parent 848b604
commit 40dd812
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/...ava/com/viaversion/viabackwards/protocol/v1_19_4to1_19_3/storage/EntityTracker1_19_4.java b/...ava/com/viaversion/viabackwards/protocol/v1_19_4to1_19_3/storage/EntityTracker1_19_4.java
@@ -25,15 +25,15 @@
 import com.viaversion.viaversion.api.protocol.packet.PacketWrapper;
 import com.viaversion.viaversion.api.type.Types;
 import com.viaversion.viaversion.data.entity.EntityTrackerBase;
-import com.viaversion.viaversion.libs.fastutil.ints.IntArraySet;
+import com.viaversion.viaversion.libs.fastutil.ints.IntOpenHashSet;
 import com.viaversion.viaversion.libs.fastutil.ints.IntSet;
 import com.viaversion.viaversion.protocols.v1_19_1to1_19_3.packet.ClientboundPackets1_19_3;
 import java.util.UUID;
 import java.util.concurrent.ThreadLocalRandom;
 
 public final class EntityTracker1_19_4 extends EntityTrackerBase {
 
-    private final IntSet generatedEntities = new IntArraySet(); // Track entities spawned to prevent duplicated entity ids
+    private final IntSet generatedEntities = new IntOpenHashSet(); // Track entities spawned to prevent duplicated entity ids
 
     public EntityTracker1_19_4(final UserConnection connection) {
         super(connection, EntityTypes1_19_4.PLAYER);
@@ -66,7 +66,7 @@ public int spawnEntity(final EntityTypes1_19_3 entityType, final int data) {
 
     @Override
     public void clearEntities() {
-        for (final Integer id : entities.keySet()) {
+        for (final int id : entities.keySet()) {
             clearLinkedEntityStorage(id);
         }
         super.clearEntities();
@@ -80,7 +80,7 @@ public void removeEntity(final int id) {
 
     public void clearLinkedEntityStorage(final int id) {
         final TrackedEntity entity = entity(id);
-        if (!entity.hasData()) {
+        if (entity == null || !entity.hasData()) {
             return;
         }