Upstream/Citizens2
1
0
Fork 0
mirror of https://github.com/CitizensDev/Citizens2.git synced 2024-11-26 12:46:04 +01:00
Code Issues Projects Releases Wiki Activity

Clear the old tracker before replacing it

Browse Source
This commit is contained in:
fullwall 2023-06-18 17:33:09 +08:00
parent a551fe4890
commit 0acda96bff
12 changed files with 12 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/util/NMSImpl.java
View File

@ -1077,6 +1077,7 @@ public class NMSImpl implements NMSBridge {
EntityTrackerEntry entry = server.getTracker().trackedEntities.get(entity.getEntityId()); EntityTrackerEntry entry = server.getTracker().trackedEntities.get(entity.getEntityId());
if (entry == null) if (entry == null)
return; return;
entry.a();
PlayerlistTrackerEntry replace = new PlayerlistTrackerEntry(entry); PlayerlistTrackerEntry replace = new PlayerlistTrackerEntry(entry);
server.getTracker().trackedEntities.a(entity.getEntityId(), replace); server.getTracker().trackedEntities.a(entity.getEntityId(), replace);
if (TRACKED_ENTITY_SET != null) { if (TRACKED_ENTITY_SET != null) {

1
v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/util/NMSImpl.java
View File

@ -1130,6 +1130,7 @@ public class NMSImpl implements NMSBridge {
EntityTrackerEntry entry = server.getTracker().trackedEntities.get(entity.getEntityId()); EntityTrackerEntry entry = server.getTracker().trackedEntities.get(entity.getEntityId());
if (entry == null) if (entry == null)
return; return;
entry.a();
PlayerlistTrackerEntry replace = new PlayerlistTrackerEntry(entry); PlayerlistTrackerEntry replace = new PlayerlistTrackerEntry(entry);
server.getTracker().trackedEntities.a(entity.getEntityId(), replace); server.getTracker().trackedEntities.a(entity.getEntityId(), replace);
if (TRACKED_ENTITY_SET != null) { if (TRACKED_ENTITY_SET != null) {

1
v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/util/NMSImpl.java
View File

@ -1137,6 +1137,7 @@ public class NMSImpl implements NMSBridge {
EntityTrackerEntry entry = server.getTracker().trackedEntities.get(entity.getEntityId()); EntityTrackerEntry entry = server.getTracker().trackedEntities.get(entity.getEntityId());
if (entry == null) if (entry == null)
return; return;
entry.a();
PlayerlistTrackerEntry replace = new PlayerlistTrackerEntry(entry); PlayerlistTrackerEntry replace = new PlayerlistTrackerEntry(entry);
server.getTracker().trackedEntities.a(entity.getEntityId(), replace); server.getTracker().trackedEntities.a(entity.getEntityId(), replace);
if (TRACKED_ENTITY_SET != null) { if (TRACKED_ENTITY_SET != null) {

1
v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/util/NMSImpl.java
View File

@ -1179,6 +1179,7 @@ public class NMSImpl implements NMSBridge {
EntityTrackerEntry entry = server.getTracker().trackedEntities.get(entity.getEntityId()); EntityTrackerEntry entry = server.getTracker().trackedEntities.get(entity.getEntityId());
if (entry == null) if (entry == null)
return; return;
entry.a();
PlayerlistTrackerEntry replace = new PlayerlistTrackerEntry(entry); PlayerlistTrackerEntry replace = new PlayerlistTrackerEntry(entry);
server.getTracker().trackedEntities.a(entity.getEntityId(), replace); server.getTracker().trackedEntities.a(entity.getEntityId(), replace);
if (TRACKED_ENTITY_SET != null) { if (TRACKED_ENTITY_SET != null) {

1
v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/util/NMSImpl.java
View File

@ -1206,6 +1206,7 @@ public class NMSImpl implements NMSBridge {
EntityTracker entry = server.getChunkProvider().playerChunkMap.trackedEntities.get(entity.getEntityId()); EntityTracker entry = server.getChunkProvider().playerChunkMap.trackedEntities.get(entity.getEntityId());
if (entry == null) if (entry == null)
return; return;
entry.a();
PlayerlistTracker replace = new PlayerlistTracker(server.getChunkProvider().playerChunkMap, entry); PlayerlistTracker replace = new PlayerlistTracker(server.getChunkProvider().playerChunkMap, entry);
server.getChunkProvider().playerChunkMap.trackedEntities.put(entity.getEntityId(), replace); server.getChunkProvider().playerChunkMap.trackedEntities.put(entity.getEntityId(), replace);
if (getHandle(entity) instanceof EntityHumanNPC) { if (getHandle(entity) instanceof EntityHumanNPC) {

1
v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/util/NMSImpl.java
View File

@ -1223,6 +1223,7 @@ public class NMSImpl implements NMSBridge {
EntityTracker entry = server.getChunkProvider().playerChunkMap.trackedEntities.get(entity.getEntityId()); EntityTracker entry = server.getChunkProvider().playerChunkMap.trackedEntities.get(entity.getEntityId());
if (entry == null) if (entry == null)
return; return;
entry.a();
PlayerlistTracker replace = new PlayerlistTracker(server.getChunkProvider().playerChunkMap, entry); PlayerlistTracker replace = new PlayerlistTracker(server.getChunkProvider().playerChunkMap, entry);
server.getChunkProvider().playerChunkMap.trackedEntities.put(entity.getEntityId(), replace); server.getChunkProvider().playerChunkMap.trackedEntities.put(entity.getEntityId(), replace);
if (getHandle(entity) instanceof EntityHumanNPC) { if (getHandle(entity) instanceof EntityHumanNPC) {

1
v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/util/NMSImpl.java
View File

@ -1260,6 +1260,7 @@ public class NMSImpl implements NMSBridge {
EntityTracker entry = server.getChunkProvider().playerChunkMap.trackedEntities.get(entity.getEntityId()); EntityTracker entry = server.getChunkProvider().playerChunkMap.trackedEntities.get(entity.getEntityId());
if (entry == null) if (entry == null)
return; return;
entry.a();
PlayerlistTracker replace = new PlayerlistTracker(server.getChunkProvider().playerChunkMap, entry); PlayerlistTracker replace = new PlayerlistTracker(server.getChunkProvider().playerChunkMap, entry);
server.getChunkProvider().playerChunkMap.trackedEntities.put(entity.getEntityId(), replace); server.getChunkProvider().playerChunkMap.trackedEntities.put(entity.getEntityId(), replace);
if (getHandle(entity) instanceof EntityHumanNPC) { if (getHandle(entity) instanceof EntityHumanNPC) {

1
v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/util/NMSImpl.java
View File

@ -1242,6 +1242,7 @@ public class NMSImpl implements NMSBridge {
TrackedEntity entry = server.getChunkProvider().chunkMap.G.get(entity.getEntityId()); TrackedEntity entry = server.getChunkProvider().chunkMap.G.get(entity.getEntityId());
if (entry == null) if (entry == null)
return; return;
entry.broadcastRemoved();
PlayerlistTracker replace = new PlayerlistTracker(server.getChunkProvider().chunkMap, entry); PlayerlistTracker replace = new PlayerlistTracker(server.getChunkProvider().chunkMap, entry);
server.getChunkProvider().chunkMap.G.put(entity.getEntityId(), replace); server.getChunkProvider().chunkMap.G.put(entity.getEntityId(), replace);
if (getHandle(entity) instanceof EntityHumanNPC) { if (getHandle(entity) instanceof EntityHumanNPC) {

1
v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/util/NMSImpl.java
View File

@ -1250,6 +1250,7 @@ public class NMSImpl implements NMSBridge {
TrackedEntity entry = server.getChunkSource().chunkMap.entityMap.get(entity.getEntityId()); TrackedEntity entry = server.getChunkSource().chunkMap.entityMap.get(entity.getEntityId());
if (entry == null) if (entry == null)
return; return;
entry.broadcastRemoved();
PlayerlistTracker replace = new PlayerlistTracker(server.getChunkSource().chunkMap, entry); PlayerlistTracker replace = new PlayerlistTracker(server.getChunkSource().chunkMap, entry);
server.getChunkSource().chunkMap.entityMap.put(entity.getEntityId(), replace); server.getChunkSource().chunkMap.entityMap.put(entity.getEntityId(), replace);
if (getHandle(entity) instanceof EntityHumanNPC) { if (getHandle(entity) instanceof EntityHumanNPC) {

1
v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/util/NMSImpl.java
View File

@ -1349,6 +1349,7 @@ public class NMSImpl implements NMSBridge {
TrackedEntity entry = server.getChunkSource().chunkMap.entityMap.get(entity.getEntityId()); TrackedEntity entry = server.getChunkSource().chunkMap.entityMap.get(entity.getEntityId());
if (entry == null) if (entry == null)
return; return;
entry.broadcastRemoved();
CitizensEntityTracker replace = new CitizensEntityTracker(server.getChunkSource().chunkMap, entry); CitizensEntityTracker replace = new CitizensEntityTracker(server.getChunkSource().chunkMap, entry);
server.getChunkSource().chunkMap.entityMap.put(entity.getEntityId(), replace); server.getChunkSource().chunkMap.entityMap.put(entity.getEntityId(), replace);
} }

1
v1_20_R1/src/main/java/net/citizensnpcs/nms/v1_20_R1/util/NMSImpl.java
View File

@ -1348,6 +1348,7 @@ public class NMSImpl implements NMSBridge {
TrackedEntity entry = server.getChunkSource().chunkMap.entityMap.get(entity.getEntityId()); TrackedEntity entry = server.getChunkSource().chunkMap.entityMap.get(entity.getEntityId());
if (entry == null) if (entry == null)
return; return;
entry.broadcastRemoved();
CitizensEntityTracker replace = new CitizensEntityTracker(server.getChunkSource().chunkMap, entry); CitizensEntityTracker replace = new CitizensEntityTracker(server.getChunkSource().chunkMap, entry);
server.getChunkSource().chunkMap.entityMap.put(entity.getEntityId(), replace); server.getChunkSource().chunkMap.entityMap.put(entity.getEntityId(), replace);
} }

1
v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/util/NMSImpl.java
View File

@ -998,6 +998,7 @@ public class NMSImpl implements NMSBridge {
EntityTrackerEntry entry = server.getTracker().trackedEntities.get(entity.getEntityId()); EntityTrackerEntry entry = server.getTracker().trackedEntities.get(entity.getEntityId());
if (entry == null) if (entry == null)
return; return;
entry.a();
PlayerlistTrackerEntry replace = new PlayerlistTrackerEntry(entry); PlayerlistTrackerEntry replace = new PlayerlistTrackerEntry(entry);
server.getTracker().trackedEntities.a(entity.getEntityId(), replace); server.getTracker().trackedEntities.a(entity.getEntityId(), replace);
if (TRACKED_ENTITY_SET != null) { if (TRACKED_ENTITY_SET != null) {