Skip to content
Open
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 7 additions & 4 deletions src/main/java/weather2/weathersystem/storm/StormObject.java
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,7 @@
import weather2.weathersystem.tornado.simple.TornadoFunnelSimple;

import java.util.*;
import java.lang.ref.WeakReference;

public class StormObject extends WeatherObject {

Expand Down Expand Up @@ -209,7 +210,7 @@ public class StormObject extends WeatherObject {

public boolean isFirenado = false;

public List<LivingEntity> listEntitiesUnderClouds = new ArrayList<>();
public List<WeakReference<LivingEntity>> listEntitiesUnderClouds = new ArrayList<>();

private boolean playerControlled = false;
private int playerControlledTimeLeft = 20;
Expand Down Expand Up @@ -1093,14 +1094,16 @@ public void trackAndExtinguishEntities() {
List<LivingEntity> listEnts = manager.getWorld().getEntitiesOfClass(LivingEntity.class, new AABB(posBP).inflate(size));
for (LivingEntity ent : listEnts) {
if (ent.level().canSeeSky(ent.blockPosition())) {
listEntitiesUnderClouds.add(ent);
listEntitiesUnderClouds.add(new WeakReference<>(ent));
}
}
}

for (LivingEntity ent : listEntitiesUnderClouds) {
for (WeakReference<LivingEntity> ent : listEntitiesUnderClouds) {
if (ent.get() == null)
continue;
if (!isFirenado) {
ent.clearFire();
ent.get().clearFire();
}
}
}
Expand Down