Upstream/Citizens2
1
0
Fork 0
mirror of https://github.com/CitizensDev/Citizens2.git synced 2024-11-22 18:45:29 +01:00
Code Issues Projects Releases Wiki Activity

Trial COW fix

Browse Source
This commit is contained in:
fullwall 2023-11-28 23:12:14 +08:00
parent 543baf7fb8
commit 86b76e81fd
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
main/src/main/java/net/citizensnpcs/trait/RotationTrait.java
View File

@ -6,8 +6,10 @@ import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.Set; import java.util.Set;
import java.util.UUID; import java.util.UUID;
import java.util.concurrent.CopyOnWriteArrayList;
import java.util.function.Function; import java.util.function.Function;
import java.util.function.Supplier; import java.util.function.Supplier;
import java.util.stream.Collectors;
import org.bukkit.Location; import org.bukkit.Location;
import org.bukkit.entity.Entity; import org.bukkit.entity.Entity;
@ -33,7 +35,7 @@ public class RotationTrait extends Trait {
@Persist(reify = true) @Persist(reify = true)
private final RotationParams globalParameters = new RotationParams(); private final RotationParams globalParameters = new RotationParams();
private final RotationSession globalSession = new RotationSession(globalParameters); private final RotationSession globalSession = new RotationSession(globalParameters);
private final List<PacketRotationSession> packetSessions = Lists.newCopyOnWriteArrayList(); private List<PacketRotationSession> packetSessions = Lists.newCopyOnWriteArrayList();
private final Map<UUID, PacketRotationSession> packetSessionsByUUID = Maps.newConcurrentMap(); private final Map<UUID, PacketRotationSession> packetSessionsByUUID = Maps.newConcurrentMap();
public RotationTrait() { public RotationTrait() {
@ -103,15 +105,15 @@ public class RotationTrait extends Trait {
for (Iterator<PacketRotationSession> itr = Iterables.concat(packetSessions, packetSessionsByUUID.values()) for (Iterator<PacketRotationSession> itr = Iterables.concat(packetSessions, packetSessionsByUUID.values())
.iterator(); itr.hasNext();) { .iterator(); itr.hasNext();) {
PacketRotationSession session = itr.next(); PacketRotationSession session = itr.next();
if (ran.contains(session)) { if (ran.contains(session))
continue; continue;
}
ran.add(session); ran.add(session);
session.run(npc.getEntity()); session.run(npc.getEntity());
if (!session.isActive()) {
itr.remove();
}
} }
packetSessions = Lists.newCopyOnWriteArrayList(packetSessions.stream().filter(s -> s.isActive())
.collect(Collectors.toCollection(CopyOnWriteArrayList::new)));
packetSessionsByUUID.values().removeIf(s -> !s.isActive());
if (npc.getNavigator().isNavigating()) if (npc.getNavigator().isNavigating())
// npc.yHeadRot = rotateIfNecessary(npc.yHeadRot, npc.yBodyRot, 75); // npc.yHeadRot = rotateIfNecessary(npc.yHeadRot, npc.yBodyRot, 75);
return; return;