Upstream/Citizens2
1
0
Fork 0
mirror of https://github.com/CitizensDev/Citizens2.git synced 2025-01-23 16:41:43 +01:00
Code Issues Projects Releases Wiki Activity

Remove indirection

Browse Source
This commit is contained in:
fullwall 2023-03-27 22:26:20 +08:00
parent 84c581dd09
commit a1281c391f
2 changed files with 8 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/util/CitizensEntityTracker.java
View File

@ -20,23 +20,23 @@ import net.minecraft.server.level.ChunkMap;
import net.minecraft.server.level.ChunkMap.TrackedEntity;
import net.minecraft.server.level.ServerEntity;
import net.minecraft.server.level.ServerPlayer;
import net.minecraft.server.network.ServerPlayerConnection;
import net.minecraft.world.entity.Entity;
public class CitizensEntityTracker extends ChunkMap.TrackedEntity {
private ServerPlayer lastUpdatedPlayer;
private final Entity tracker;
public CitizensEntityTracker(ChunkMap map, Entity entity, int i, int j, boolean flag) {
map.super(entity, i, j, flag);
this.tracker = entity;
try {
Set set = (Set) TRACKING_SET_GETTER.invoke(this);
TRACKING_SET_SETTER.invoke(this, new ForwardingSet() {
Set<ServerPlayerConnection> set = (Set<ServerPlayerConnection>) TRACKING_SET_GETTER.invoke(this);
TRACKING_SET_SETTER.invoke(this, new ForwardingSet<ServerPlayerConnection>() {
@Override
public boolean add(Object conn) {
public boolean add(ServerPlayerConnection conn) {
boolean res = super.add(conn);
if (res) {
updateLastPlayer();
updateLastPlayer(conn.getPlayer());
}
return res;
}
@ -55,9 +55,8 @@ public class CitizensEntityTracker extends ChunkMap.TrackedEntity {
this(map, getTracker(entry), getTrackingDistance(entry), getE(entry), getF(entry));
}
public void updateLastPlayer() {
if (tracker.isRemoved() || lastUpdatedPlayer == null
|| tracker.getBukkitEntity().getType() != EntityType.PLAYER)
public void updateLastPlayer(ServerPlayer lastUpdatedPlayer) {
if (tracker.isRemoved() || tracker.getBukkitEntity().getType() != EntityType.PLAYER)
return;
final ServerPlayer entityplayer = lastUpdatedPlayer;
boolean sendTabRemove = NMS.sendTabListAdd(entityplayer.getBukkitEntity(), (Player) tracker.getBukkitEntity());
@ -94,7 +93,6 @@ public class CitizensEntityTracker extends ChunkMap.TrackedEntity {
if (entityplayer instanceof EntityHumanNPC)
return;
this.lastUpdatedPlayer = entityplayer;
super.updatePlayer(entityplayer);
}

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

@ -1332,10 +1332,7 @@ public class NMSImpl implements NMSBridge {
} catch (Throwable e) {
e.printStackTrace();
}
NMSImpl.sendPacket(recipient, packet); /* if (VIA_ENABLED == true) {
int version = Via.getAPI().getPlayerVersion(recipient);
return version < 761;
}*/
NMSImpl.sendPacket(recipient, packet);
return true;
}