Fix skins of server-only NPCs being unreliable (fixes #486)

This commit is contained in:
Jonas Herzig
2021-07-24 14:41:41 +02:00
parent 3ef355a267
commit 35fef5176d
2 changed files with 32 additions and 0 deletions

View File

@@ -0,0 +1,31 @@
package com.replaymod.replay.mixin;
import net.minecraft.client.MinecraftClient;
import net.minecraft.client.network.AbstractClientPlayerEntity;
import net.minecraft.client.network.PlayerListEntry;
import org.spongepowered.asm.mixin.Mixin;
import org.spongepowered.asm.mixin.Shadow;
import org.spongepowered.asm.mixin.injection.At;
import org.spongepowered.asm.mixin.injection.Inject;
import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
import javax.annotation.Nullable;
@Mixin(AbstractClientPlayerEntity.class)
public abstract class Mixin_FixNPCSkinCaching {
@Shadow @Nullable protected abstract PlayerListEntry getPlayerListEntry();
@Inject(method = "<init>", at = @At("RETURN"))
private void forceCachePlayerListEntry(CallbackInfo ci) {
// Server-side NPCs (without a client mod) rely on the player list entry being cached in this class to function
// because the remove the entry shortly after spawning the player. However this method is only called when the
// player is rendered, and if we are currently jumping around in a replay then it most likely will not be
// rendered while the entry is still there. The result is that most NPCs get Steve/Alex skins instead of the
// intended ones. To fix that, we make this caching-glitch which servers have come to rely on an actual feature
// by just fetching the cache in the constructor which arguably is what MC should have done to begin with,
// especially because the spawn packet handling code already requires the entry to be present).
if (MinecraftClient.getInstance().getNetworkHandler() != null) { // will be null if this is the client player
this.getPlayerListEntry();
}
}
}

View File

@@ -5,6 +5,7 @@
"mixins": [], "mixins": [],
"server": [], "server": [],
"client": [ "client": [
"Mixin_FixNPCSkinCaching",
//#if MC>=11600 //#if MC>=11600
"Mixin_MoveRealmsButton", "Mixin_MoveRealmsButton",
//#endif //#endif