mirror/Purpur
2
0
Fork 0
mirror of https://github.com/PurpurMC/Purpur.git synced 2025-02-17 13:00:04 +08:00
Code Issues Packages Projects Releases Wiki Activity

Updated Upstream (Paper)

Browse Source 
Upstream has released updates that appear to apply and compile correctly

Paper Changes:
PaperMC/Paper@d9bf5e7 Add method to set noclip on arrows (#7263)
PaperMC/Paper@c34fb09 Add ghast api (#7554)
This commit is contained in:
William Blake Galbreath 2022-03-06 16:33:15 -06:00
parent f5725829d1
commit b5a9c83a92
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
gradle.properties
View File

@ -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

8
patches/server/0006-Ridables.patch
View File

@ -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