Skip to content
This repository has been archived by the owner on Apr 8, 2023. It is now read-only.

playermanager: fix player spawn overriding appearance change. #2536

Merged
merged 1 commit into from
Apr 30, 2020
Merged

playermanager: fix player spawn overriding appearance change. #2536

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 4 additions & 12 deletions runelite-client/src/main/java/net/runelite/client/game/PlayerManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,6 @@
import net.runelite.api.events.AnimationChanged;
import net.runelite.api.events.PlayerAppearanceChanged;
import net.runelite.api.events.PlayerDespawned;
import net.runelite.api.events.PlayerSpawned;
import net.runelite.api.kit.KitType;
import net.runelite.client.eventbus.EventBus;
import net.runelite.client.events.AttackStyleChanged;
Expand Down Expand Up @@ -59,7 +58,6 @@ public class PlayerManager
this.itemManager = itemManager;
this.eventBus = eventBus;
eventBus.subscribe(PlayerDespawned.class, this, this::onPlayerDespawned);
eventBus.subscribe(PlayerSpawned.class, this, this::onPlayerSpawned);
eventBus.subscribe(AnimationChanged.class, this, this::onAnimationChanged);
eventBus.subscribe(PlayerAppearanceChanged.class, this, this::onAppearenceChanged);
}
Expand Down Expand Up @@ -198,15 +196,15 @@ public void updateStats(Player requestedPlayer)

private void onAppearenceChanged(PlayerAppearanceChanged event)
{
final PlayerContainer player = playerMap.get(event.getPlayer().getName());
PlayerContainer player = playerMap.get(event.getPlayer().getName());

if (player == null)
{
return;
player = new PlayerContainer(event.getPlayer());
playerMap.put(event.getPlayer().getName(), player);
}

update(player);
player.reset();
player.setFriend(client.isFriended(player.getName(), false));
player.setClan(client.isClanMember(player.getName()));
}
Expand All @@ -217,12 +215,6 @@ private void onPlayerDespawned(PlayerDespawned event)
playerMap.remove(player.getName());
}

private void onPlayerSpawned(PlayerSpawned event)
{
final Player player = event.getPlayer();
playerMap.put(player.getName(), new PlayerContainer(player));
}

private void onAnimationChanged(AnimationChanged event)
{
final Actor actor = event.getActor();
Expand Down Expand Up @@ -547,4 +539,4 @@ else if (actor instanceof NPC)
}
return "No Target Detected";
}
}
}