From 3631d06ca7325c915a1e8da45fe816d49a8a3c83 Mon Sep 17 00:00:00 2001 From: QPCrummer <66036033+QPCrummer@users.noreply.github.com> Date: Mon, 13 Jan 2025 04:00:56 -0500 Subject: [PATCH] Fix invulnerability I hate the copyFrom function now --- .../lifesteal/mixin/ServerPlayerEntityMixin.java | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/main/java/com/github/certifiedtater/lifesteal/mixin/ServerPlayerEntityMixin.java b/src/main/java/com/github/certifiedtater/lifesteal/mixin/ServerPlayerEntityMixin.java index b4ab4cf..16bed16 100644 --- a/src/main/java/com/github/certifiedtater/lifesteal/mixin/ServerPlayerEntityMixin.java +++ b/src/main/java/com/github/certifiedtater/lifesteal/mixin/ServerPlayerEntityMixin.java @@ -98,6 +98,11 @@ public ServerPlayerEntityMixin(World world, BlockPos pos, float yaw, GameProfile nbt.putInt("invulnerability_ticks", invulnerableTicks); } + @Inject(method = "copyFrom", at = @At("TAIL")) + private void lifesteal$copyInvulnerability(ServerPlayerEntity oldPlayer, boolean alive, CallbackInfo ci) { + this.invulnerableTicks = ((PlayerInvulnerabilityInterface)oldPlayer).getRemaining(); + } + @Override public void setReviveInvulnerability() { invulnerableTicks = this.server.getGameRules().getInt(LifeStealGamerules.RESPAWN_INVULNERABILITY) * 20;