From 33466e00640408026704876b3da4e506a72ecf04 Mon Sep 17 00:00:00 2001 From: "Vadim A. Yegorov" Date: Tue, 11 Jul 2023 23:51:07 -0700 Subject: [PATCH] Do not handle player death in MixinPlayer. Fixes #420 --- .../java/org/cardboardpowered/mixin/entity/MixinPlayer.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/main/java/org/cardboardpowered/mixin/entity/MixinPlayer.java b/src/main/java/org/cardboardpowered/mixin/entity/MixinPlayer.java index ffc70363..59a9f275 100644 --- a/src/main/java/org/cardboardpowered/mixin/entity/MixinPlayer.java +++ b/src/main/java/org/cardboardpowered/mixin/entity/MixinPlayer.java @@ -246,6 +246,7 @@ public void openHandledScreen_c(NamedScreenHandlerFactory factory, CallbackInfoR ci.cancel(); } + /* @Inject(at = @At("HEAD"), method = "onDeath", cancellable = true) public void bukkitizeDeath(DamageSource damagesource, CallbackInfo ci) { boolean flag = this.world.getGameRules().getBoolean(GameRules.SHOW_DEATH_MESSAGES); @@ -331,6 +332,7 @@ public void bukkitizeDeath(DamageSource damagesource, CallbackInfo ci) { ci.cancel(); return; } + */ @Shadow public void forgiveMobAnger() {} @@ -423,4 +425,4 @@ public void cardboard_doInventoryCloseEvent(CallbackInfo ci) { handler.transferTo(((ServerPlayerEntity)(Object)this).playerScreenHandler, (CraftHumanEntity) getBukkitEntity()); } -} \ No newline at end of file +}