diff --git a/gradle.properties b/gradle.properties index a66ae8a1d..3231f473d 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,7 +1,7 @@ group = org.purpurmc.purpur version = 1.18.2-R0.1-SNAPSHOT -paperCommit = 7b9c30fb82d79599878543d7877f686678db0792 +paperCommit = c34fb0942a73b932dc182c063e398ed47182fa61 org.gradle.caching = true org.gradle.parallel = true diff --git a/patches/server/0006-Ridables.patch b/patches/server/0006-Ridables.patch index 94297b9b0..ee789e40f 100644 --- a/patches/server/0006-Ridables.patch +++ b/patches/server/0006-Ridables.patch @@ -3352,7 +3352,7 @@ index 7f695625134ba55f85c54efddd049e167e0d1d8b..169a19b605a4b7edda0d1d04e83d9bb5 this.targetSelector.addGoal(2, (new NearestAttackableTargetGoal<>(this, Player.class, true)).setUnseenMemoryTicks(300)); this.targetSelector.addGoal(3, (new NearestAttackableTargetGoal<>(this, AbstractVillager.class, false)).setUnseenMemoryTicks(300)); diff --git a/src/main/java/net/minecraft/world/entity/monster/Ghast.java b/src/main/java/net/minecraft/world/entity/monster/Ghast.java -index f834e96c48cce6af65a65dafcdeb2cf0ea12763a..e58a819baee8a8836eef5de5bc4914893e07c7f6 100644 +index 77a5f8339df5a46967713b51570735de828f0b49..edc38e172712ebd79c1bf427d8898ab0f8244874 100644 --- a/src/main/java/net/minecraft/world/entity/monster/Ghast.java +++ b/src/main/java/net/minecraft/world/entity/monster/Ghast.java @@ -44,11 +44,47 @@ public class Ghast extends FlyingMob implements Enemy { @@ -3403,7 +3403,7 @@ index f834e96c48cce6af65a65dafcdeb2cf0ea12763a..e58a819baee8a8836eef5de5bc491489 this.targetSelector.addGoal(1, new NearestAttackableTargetGoal<>(this, Player.class, 10, true, false, (entityliving) -> { return Math.abs(entityliving.getY() - this.getY()) <= 4.0D; })); -@@ -90,7 +126,7 @@ public class Ghast extends FlyingMob implements Enemy { +@@ -96,7 +132,7 @@ public class Ghast extends FlyingMob implements Enemy { } public static AttributeSupplier.Builder createAttributes() { @@ -3412,7 +3412,7 @@ index f834e96c48cce6af65a65dafcdeb2cf0ea12763a..e58a819baee8a8836eef5de5bc491489 } @Override -@@ -147,7 +183,7 @@ public class Ghast extends FlyingMob implements Enemy { +@@ -153,7 +189,7 @@ public class Ghast extends FlyingMob implements Enemy { return 2.6F; } @@ -3421,7 +3421,7 @@ index f834e96c48cce6af65a65dafcdeb2cf0ea12763a..e58a819baee8a8836eef5de5bc491489 private final Ghast ghast; private int floatDuration; -@@ -158,7 +194,7 @@ public class Ghast extends FlyingMob implements Enemy { +@@ -164,7 +200,7 @@ public class Ghast extends FlyingMob implements Enemy { } @Override