Rename hasSentAvatarDataNotify() to hasSentLoginPackets()

This commit is contained in:
Melledy 2022-07-21 16:27:43 -07:00
parent b505b0825a
commit 8651cdd12b
3 changed files with 10 additions and 14 deletions

View File

@ -496,7 +496,7 @@ public class Avatar {
item.setEquipCharacter(this.getAvatarId());
item.save();
if (this.getPlayer().hasSentAvatarDataNotify()) {
if (this.getPlayer().hasSentLoginPackets()) {
this.getPlayer().sendPacket(new PacketAvatarEquipChangeNotify(this, item));
}
@ -732,7 +732,7 @@ public class Avatar {
this.setFightProperty(FightProperty.FIGHT_PROP_CUR_HP, this.getFightProperty(FightProperty.FIGHT_PROP_MAX_HP) * hpPercent);
// Packet
if (getPlayer() != null && getPlayer().hasSentAvatarDataNotify()) {
if (getPlayer() != null && getPlayer().hasSentLoginPackets()) {
// Update stats for client
getPlayer().sendPacket(new PacketAvatarFightPropNotify(this));
// Update client abilities

View File

@ -170,7 +170,7 @@ public class Player {
@Transient private boolean paused;
@Transient private int enterSceneToken;
@Transient private SceneLoadState sceneState;
@Transient private boolean hasSentAvatarDataNotify;
@Transient private boolean hasSentLoginPackets;
@Transient private long nextSendPlayerLocTime = 0;
private transient final Int2ObjectMap<CoopRequest> coopRequests;
@ -562,7 +562,7 @@ public class Player {
}
public boolean isFirstLoginEnterScene() {
return !this.hasSentAvatarDataNotify;
return !this.hasSentLoginPackets;
}
public TeamManager getTeamManager() {
@ -884,14 +884,10 @@ public class Player {
this.godmode = godmode;
}
public boolean hasSentAvatarDataNotify() {
return hasSentAvatarDataNotify;
public boolean hasSentLoginPackets() {
return hasSentLoginPackets;
}
public void setHasSentAvatarDataNotify(boolean hasSentAvatarDataNotify) {
this.hasSentAvatarDataNotify = hasSentAvatarDataNotify;
}
public void addAvatar(Avatar avatar, boolean addToCurrentTeam) {
boolean result = getAvatars().addAvatar(avatar);
@ -900,7 +896,7 @@ public class Player {
getAvatars().addStartingWeapon(avatar);
// Done
if (hasSentAvatarDataNotify()) {
if (hasSentLoginPackets()) {
// Recalc stats
avatar.recalcStats();
// Packet, show notice on left if the avatar will be added to the team
@ -1361,7 +1357,7 @@ public class Player {
// First notify packets sent
this.setHasSentAvatarDataNotify(true);
this.hasSentLoginPackets = true;
// Send server welcome chat.
this.getServer().getChatManager().sendServerWelcomeMessages(this);

View File

@ -283,7 +283,7 @@ public class World implements Iterable<Player> {
private void updatePlayerInfos(Player paramPlayer) {
for (Player player : getPlayers()) {
// Dont send packets if player is logging in and filter out joining player
if (!player.hasSentAvatarDataNotify() || player == paramPlayer) {
if (!player.hasSentLoginPackets() || player == paramPlayer) {
continue;
}