Fixup missed fall location types

PaperMC · Dec 29, 2024 · 8e40f76 · 8e40f76
1 parent 581e20d
commit 8e40f76
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 5 deletions.
diff --git a/paper-api/src/main/java/io/papermc/paper/InternalAPIBridge.java b/paper-api/src/main/java/io/papermc/paper/InternalAPIBridge.java
@@ -58,7 +58,7 @@ class Holder {
      *
      * @param damageSource damage source
      * @param damage damage amount
-     * @param fallLocationType fall location
+     * @param fallLocationType fall location type
      * @param fallDistance fall distance
      * @return combat entry
      */

diff --git a/paper-api/src/main/java/io/papermc/paper/world/damagesource/CombatEntry.java b/paper-api/src/main/java/io/papermc/paper/world/damagesource/CombatEntry.java
@@ -66,10 +66,10 @@ static CombatEntry combatEntry(LivingEntity entity, DamageSource damageSource, f
      *
      * @param damageSource damage source
      * @param damage damage amount
-     * @param fallLocationType fall location
+     * @param fallLocationType fall location type
      * @param fallDistance fall distance
      * @return a new combat entry
-     * @see LivingEntity#calculateFallLocation()
+     * @see LivingEntity#calculateFallLocationType()
      * @see Entity#getFallDistance()
      */
     static CombatEntry combatEntry(DamageSource damageSource, float damage, @Nullable FallLocationType fallLocationType, float fallDistance) {

diff --git a/paper-api/src/main/java/org/bukkit/entity/LivingEntity.java b/paper-api/src/main/java/org/bukkit/entity/LivingEntity.java
@@ -1488,5 +1488,5 @@ default void swingHand(@NotNull org.bukkit.inventory.EquipmentSlot hand) {
      * @since 1.21.4
      */
     @ApiStatus.Experimental
-    @NotNull FallLocationType calculateFallLocation();
+    @NotNull FallLocationType calculateFallLocationType();
 }
diff --git a/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java b/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
@@ -1224,7 +1224,7 @@ public CombatTracker getCombatTracker() {
     }
 
     @Override
-    public FallLocationType calculateFallLocation() {
+    public FallLocationType calculateFallLocationType() {
         net.minecraft.world.damagesource.FallLocation fallLocation = net.minecraft.world.damagesource.FallLocation.getCurrentFallLocation(this.getHandle());
         return fallLocation == null ? FallLocationType.GENERIC : PaperCombatTrackerWrapper.minecraftToPaper(fallLocation);
     }