From b7ee2e0ddfde307fa7af4adfe690242181ec7dcf Mon Sep 17 00:00:00 2001 From: IzzelAliz Date: Sat, 30 Jan 2021 16:13:43 +0800 Subject: [PATCH] Fix player has 0 health after respawn (#133) --- .../common/mixin/core/server/management/PlayerListMixin.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/server/management/PlayerListMixin.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/server/management/PlayerListMixin.java index 65e1dae9..07cabf29 100644 --- a/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/server/management/PlayerListMixin.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/server/management/PlayerListMixin.java @@ -444,7 +444,10 @@ public abstract class PlayerListMixin implements PlayerListBridge { } serverplayerentity.connection = playerIn.connection; - serverplayerentity.copyFrom(playerIn, conqueredEnd); // keep inventory here since inventory dropped at ServerPlayerEntity#onDeath + serverplayerentity.copyFrom(playerIn, conqueredEnd); + if (!conqueredEnd) { // keep inventory here since inventory dropped at ServerPlayerEntity#onDeath + serverplayerentity.inventory.copyInventory(playerIn.inventory); + } playerIn.remove(false); // Forge: clone event had a chance to see old data, now discard it serverplayerentity.setEntityId(playerIn.getEntityId()); serverplayerentity.setPrimaryHand(playerIn.getPrimaryHand());