Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Do not handle player death in MixinPlayer. Temporary fix for #420 #423

Open
wants to merge 1 commit into
base: ver/1.18.2
Choose a base branch
from
Open

Do not handle player death in MixinPlayer. Temporary fix for #420 #423

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
4 changes: 3 additions & 1 deletion src/main/java/org/cardboardpowered/mixin/entity/MixinPlayer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down Expand Up @@ -331,6 +332,7 @@ public void bukkitizeDeath(DamageSource damagesource, CallbackInfo ci) {
ci.cancel();
return;
}
*/

@Shadow
public void forgiveMobAnger() {}
Expand Down Expand Up @@ -423,4 +425,4 @@ public void cardboard_doInventoryCloseEvent(CallbackInfo ci) {
handler.transferTo(((ServerPlayerEntity)(Object)this).playerScreenHandler, (CraftHumanEntity) getBukkitEntity());
}

}
}