Upstream
/
EntityTrackerFixer
mirror of https://github.com/Elecast2/EntityTrackerFixer.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fix frozen entities

This commit is contained in:
Esmorall 2019-12-10 18:41:55 -03:00
parent b83763c934
commit 0ff91139e7
1 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
EntityTrackerFixer/src/net/minemora/entitytrackerfixer/entitytick/EntityTickManager.java
View File

@ -5,6 +5,7 @@ import java.util.HashMap;
import java.util.Map;
import java.util.Timer;
import java.util.TimerTask;
import java.util.concurrent.atomic.AtomicInteger;
import org.bukkit.Bukkit;
import org.bukkit.craftbukkit.v1_14_R1.CraftWorld;
@ -13,15 +14,17 @@ import net.minecraft.server.v1_14_R1.WorldServer;
import net.minemora.entitytrackerfixer.UntrackerTask;
import net.minemora.entitytrackerfixer.util.ReflectionUtils;
public class EntityTickManager extends TimerTask {
public class EntityTickManager extends TimerTask {
private static Field tickingField;
private static Field tickingEntitiesField;
private static Field entityCount;
static {
try {
tickingEntitiesField = ReflectionUtils.getClassPrivateField(WorldServer.class, "tickingEntities");
tickingField = ReflectionUtils.getClassPrivateField(WorldServer.class, "ticking");
entityCount = ReflectionUtils.getClassPrivateField(net.minecraft.server.v1_14_R1.Entity.class, "entityCount");
} catch (NoSuchFieldException | SecurityException | IllegalArgumentException | IllegalAccessException e) {
e.printStackTrace();
}
@ -71,7 +74,13 @@ public class EntityTickManager extends TimerTask {
if(entity == null) {
continue;
}
ws.entitiesById.put(i, entity);
if(ws.entitiesById.containsKey(i)) {
int id = ((AtomicInteger)entityCount.get(null)).incrementAndGet();
ws.entitiesById.put(id, entity);
}
else {
ws.entitiesById.put(i, entity);
}
}
ewc.getToTick().clear();
} catch (IllegalArgumentException | IllegalAccessException e) {