twin/paper-mc
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2025-05-19 13:40:24 -07:00
Code Issues Packages Projects Releases Wiki Activity

Correct nullable fall location type

Browse Source
This commit is contained in:
Bjarne Koll 2025-05-02 18:57:18 +02:00
parent ec421715ed
commit 51345a1cc8
No known key found for this signature in database
GPG Key ID: 9576DAF3FDDB088F
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
paper-server/src/main/java/io/papermc/paper/world/damagesource/PaperCombatTrackerWrapper.java
View File

@ -6,6 +6,7 @@ import io.papermc.paper.adventure.PaperAdventure;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
import net.kyori.adventure.text.Component; import net.kyori.adventure.text.Component;
import net.minecraft.Optionull;
import net.minecraft.Util; import net.minecraft.Util;
import net.minecraft.world.damagesource.FallLocation; import net.minecraft.world.damagesource.FallLocation;
import org.bukkit.entity.LivingEntity; import org.bukkit.entity.LivingEntity;
@ -75,7 +76,7 @@ public record PaperCombatTrackerWrapper(
@Override @Override
public FallLocationType calculateFallLocationType() { public FallLocationType calculateFallLocationType() {
final FallLocation fallLocation = FallLocation.getCurrentFallLocation(this.handle().mob); final FallLocation fallLocation = FallLocation.getCurrentFallLocation(this.handle().mob);
return fallLocation == null ? FallLocationType.GENERIC : PaperCombatTrackerWrapper.minecraftToPaper(fallLocation); return Optionull.map(fallLocation, PaperCombatTrackerWrapper::minecraftToPaper);
} }
private static final BiMap<FallLocation, FallLocationType> FALL_LOCATION_MAPPING = Util.make(() -> { private static final BiMap<FallLocation, FallLocationType> FALL_LOCATION_MAPPING = Util.make(() -> {