Skip to content

Fix forge crashes on death #559

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

Merged
object-Object merged 1 commit into from
Dec 14, 2023
Merged

Fix forge crashes on death #559

Show file tree
Hide file tree
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
2 changes: 1 addition & 1 deletion Forge/src/main/java/at/petrak/hexcasting/forge/cap/adimpl/CapClientCastingStack.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ public ClientCastingStack get() {

@SubscribeEvent
public static void tickClientPlayer(TickEvent.PlayerTickEvent evt) {
if (evt.side == LogicalSide.CLIENT)
if (evt.side == LogicalSide.CLIENT && !evt.player.isDeadOrDying())
evt.player.getCapability(HexCapabilities.CLIENT_CASTING_STACK).resolve()
.get().get().tick();
}
Expand Down
2 changes: 2 additions & 0 deletions Forge/src/main/java/at/petrak/hexcasting/forge/xplat/ForgeClientXplatImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,8 @@ public void registerItemProperty(Item item, ResourceLocation id, ItemPropertyFun
@Override
public ClientCastingStack getClientCastingStack(Player player) {
var maybeCap = player.getCapability(HexCapabilities.CLIENT_CASTING_STACK).resolve();
if (maybeCap.isEmpty())
return new ClientCastingStack(); // lie
return maybeCap.get().get();
}

Expand Down