fix: prevent NPE in EntityAbstractSummonedSword when TargetSelector rejects a target#169
Open
ZaeXT wants to merge 3 commits into
Open
fix: prevent NPE in EntityAbstractSummonedSword when TargetSelector rejects a target#169ZaeXT wants to merge 3 commits into
ZaeXT wants to merge 3 commits into
Conversation
…ashes (Ticking entity).
There was a problem hiding this comment.
Pull request overview
This PR aims to prevent client/server crashes caused by a NullPointerException when EntityAbstractSummonedSword#onHit is invoked with a null HitResult (as observed in “Ticking entity” crash reports).
Changes:
- Add an early-return null check in
EntityAbstractSummonedSword#onHit(HitResult)to avoid dereferencing a nullHitResult.
💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.
Comment on lines
463
to
465
| if (raytraceResultIn == null) return; | ||
| HitResult.Type type = raytraceResultIn.getType(); | ||
| switch (type) { |
| } | ||
|
|
||
| @Override | ||
| protected void onHit(HitResult raytraceResultIn) { |
…t NPE crashes (Ticking entity)." This reverts commit 53c74f2.
ZaeXT
changed the title
Comment on lines
+378
to
382
| if (raytraceresult == null) | ||
| break; | ||
| if (!(disallowedHitBlock && raytraceresult.getType() == HitResult.Type.BLOCK) | ||
| && impactCheck) { | ||
| this.onHit(raytraceresult); |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
本PR尝试修复一个在使用幻影剑时潜在的会导致服务端与客户端同时崩溃，且无法正常恢复的恶性NPE Bug
服务端崩溃恢复方法：
修改world/serverconfig/forge-server.toml
removeErroringBlockEntities = true
removeErroringEntities = true
服务端崩溃日志如下：