Skip to content

Commit 71a47d3

Browse files
authored
Merge pull request #773 from Vonr/fix/playerkill-null-source
fix: check for null source in playerKill handler to prevent NPE
2 parents cb69a60 + cd16acc commit 71a47d3

File tree

1 file changed

+5
-0
lines changed

1 file changed

+5
-0
lines changed

common/src/main/java/dev/ftb/mods/ftbquests/FTBQuestsEventHandler.java

+5
Original file line numberDiff line numberDiff line change
@@ -114,6 +114,11 @@ private void playerChangedTeam(PlayerChangedTeamEvent event) {
114114
}
115115

116116
private EventResult playerKill(LivingEntity entity, DamageSource source) {
117+
// `source` should never be null, this is a defensive check against badly behaved mods.
118+
if (source == null) {
119+
return EventResult.pass();
120+
}
121+
117122
if (source.getEntity() instanceof ServerPlayer player && !PlayerHooks.isFake(player)) {
118123
if (killTasks == null) {
119124
killTasks = ServerQuestFile.INSTANCE.collect(KillTask.class);

0 commit comments

Comments
 (0)