Update Upstream (Pufferfish)

build.gradle.kts

@@ -4,7 +4,7 @@ plugins {
     java
     `maven-publish`
     id("com.github.johnrengelman.shadow") version "7.1.2" apply false
-    id("io.papermc.paperweight.patcher") version "1.3.3"
+    id("io.papermc.paperweight.patcher") version "1.3.4"
 }
 
 repositories {

gradle.properties

@@ -2,7 +2,7 @@ group=wtf.etil.mirai
 version=1.18.1-R0.1-SNAPSHOT
 mcVersion=1.18.1
 packageVersion=1_18_R1
-pufferfishRef=3e75ff07a5f95e1d627f47bec2baa8eed7a54e00
+pufferfishRef=110966ec14ddce354d8f1d3c28939025cfa86ab3
 
 org.gradle.caching=true
 org.gradle.caching.debug=false

patches/api/0011-LivingEntity-safeFallDistance.patch

@@ -1,33 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: William Blake Galbreath <blake.galbreath@gmail.com>
-Date: Sun, 5 May 2019 12:58:19 -0500
-Subject: [PATCH] LivingEntity safeFallDistance
-
-Original code by PurpurMC, licensed under MIT
-You can find the original code on https://github.com/PurpurMC/Purpur
-
-diff --git a/src/main/java/org/bukkit/entity/LivingEntity.java b/src/main/java/org/bukkit/entity/LivingEntity.java
-index 31353bd20404a8c2acf6bf0df524dc3cae324272..e532430b7444cef4e383b3afb637cc6060d8686a 100644
---- a/src/main/java/org/bukkit/entity/LivingEntity.java
-+++ b/src/main/java/org/bukkit/entity/LivingEntity.java
-@@ -910,4 +910,20 @@ public interface LivingEntity extends Attributable, Damageable, ProjectileSource
-      */
-     void setHurtDirection(float hurtDirection);
-     // Paper end
-+
-+    // Purpur start
-+    /**
-+     * Gets the distance (in blocks) this entity can safely fall without taking damage
-+     *
-+     * @return Safe fall distance
-+     */
-+    float getSafeFallDistance();
-+
-+    /**
-+     * Set the distance (in blocks) this entity can safely fall without taking damage
-+     *
-+     * @param safeFallDistance Safe fall distance
-+     */
-+    void setSafeFallDistance(float safeFallDistance);
-+    // Purpur end
- }

patches/server/0078-LivingEntity-safeFallDistance.patch

@@ -1,86 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: William Blake Galbreath <Blake.Galbreath@GMail.com>
-Date: Sun, 5 May 2019 12:58:45 -0500
-Subject: [PATCH] LivingEntity safeFallDistance
-
-Original code by PurpurMC, licensed under MIT
-You can find the original code on https://github.com/PurpurMC/Purpur
-
-diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index 7f8c9538c231a7aca163ecdb3966cd2dc23e2cad..1f41e0a3d2b4b5bd5f2db217ef24a5711ac8513d 100644
---- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
-+++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-@@ -251,6 +251,7 @@ public abstract class LivingEntity extends Entity {
-     // CraftBukkit start
-     public int expToDrop;
-     public int maxAirTicks = 300;
-+    public float safeFallDistance = 3.0F; // Purpur
-     public boolean forceDrops;
-     public ArrayList<org.bukkit.inventory.ItemStack> drops = new ArrayList<org.bukkit.inventory.ItemStack>();
-     public final org.bukkit.craftbukkit.attribute.CraftAttributeMap craftAttributes;
-@@ -346,8 +347,8 @@ public abstract class LivingEntity extends Entity {
-             this.tryAddSoulSpeed();
-         }
- 
--        if (!this.level.isClientSide && this.fallDistance > 3.0F && onGround) {
--            float f = (float) Mth.ceil(this.fallDistance - 3.0F);
-+        if (!this.level.isClientSide && this.fallDistance > this.safeFallDistance && onGround) { // Purpur
-+            float f = (float) Mth.ceil(this.fallDistance - this.safeFallDistance); // Purpur
- 
-             if (!landedState.isAir()) {
-                 double d1 = Math.min((double) (0.2F + f / 15.0F), 2.5D);
-@@ -1921,7 +1922,7 @@ public abstract class LivingEntity extends Entity {
-         MobEffectInstance mobeffect = this.getEffect(MobEffects.JUMP);
-         float f2 = mobeffect == null ? 0.0F : (float) (mobeffect.getAmplifier() + 1);
- 
--        return Mth.ceil((fallDistance - 3.0F - f2) * damageMultiplier);
-+        return Mth.ceil((fallDistance - this.safeFallDistance - f2) * damageMultiplier); // Purpur
-     }
- 
-     protected void playBlockFallSound() {
-diff --git a/src/main/java/net/minecraft/world/entity/animal/horse/AbstractHorse.java b/src/main/java/net/minecraft/world/entity/animal/horse/AbstractHorse.java
-index a726006888bbbdb290bcda3ac4fd45d68ba51b79..829753b2a811e97a16189d932f03f4f652b185c6 100644
---- a/src/main/java/net/minecraft/world/entity/animal/horse/AbstractHorse.java
-+++ b/src/main/java/net/minecraft/world/entity/animal/horse/AbstractHorse.java
-@@ -286,7 +286,7 @@ public abstract class AbstractHorse extends Animal implements ContainerListener,
- 
-     @Override
-     protected int calculateFallDamage(float fallDistance, float damageMultiplier) {
--        return Mth.ceil((fallDistance * 0.5F - 3.0F) * damageMultiplier);
-+        return Mth.ceil((fallDistance * 0.5F - this.safeFallDistance) * damageMultiplier);
-     }
- 
-     protected int getInventorySize() {
-diff --git a/src/main/java/net/minecraft/world/entity/monster/Giant.java b/src/main/java/net/minecraft/world/entity/monster/Giant.java
-index 0d578ab12c874bd2daccc4322a3fe1abafa4bc18..a183226bb0cf01c5aaf7babe1d08fa9ab7388648 100644
---- a/src/main/java/net/minecraft/world/entity/monster/Giant.java
-+++ b/src/main/java/net/minecraft/world/entity/monster/Giant.java
-@@ -12,6 +12,7 @@ import net.minecraft.world.level.LevelReader;
- public class Giant extends Monster {
-     public Giant(EntityType<? extends Giant> type, Level world) {
-         super(type, world);
-+        this.safeFallDistance = 10.0F; // Purpur
-     }
- 
-     @Override
-diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
-index c022751e3b45469cc0ad6732e2d6ff08918bafa4..1dcfe129ec3633de67404ab5ab72cdcee31d3d9d 100644
---- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
-+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
-@@ -920,4 +920,16 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
-         throw new IllegalArgumentException(entityCategory + " is an unrecognized entity category");
-     }
-     // Paper end
-+
-+    // Purpur start
-+    @Override
-+    public float getSafeFallDistance() {
-+        return getHandle().safeFallDistance;
-+    }
-+
-+    @Override
-+    public void setSafeFallDistance(float safeFallDistance) {
-+        getHandle().safeFallDistance = safeFallDistance;
-+    }
-+    // Purpur end
- }