Mirrors/Purpur
1
0
Fork 1
mirror of https://github.com/PurpurMC/Purpur.git synced 2026-02-18 00:47:42 +01:00
Code Issues Packages Projects Releases Wiki Activity

Revert "Update Upstream (Airplane)" (wiggle didn't wiggle today)

Browse Source 
This reverts commit 14d7da2147.
This commit is contained in:
Ben Kerllenevich
2021-09-15 21:32:30 -04:00
parent 14d7da2147
commit 91f8009a03
2 changed files with 209 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
patches/server/0007-Ridables.patch
View File

@@ -4287,7 +4287,7 @@ index 025d53ab0787d596f4c486b15d286b9547838e16..708ba2c64a0736a30e477017b46dc711
public void setPersistentAngerTarget(@Nullable UUID uuid) {
this.persistentAngerTarget = uuid;
diff --git a/src/main/java/net/minecraft/world/entity/monster/hoglin/Hoglin.java b/src/main/java/net/minecraft/world/entity/monster/hoglin/Hoglin.java
index c510da19883d1aa79b2fc25e2d9c8f5cd8dd7bfa..b5773abd11ee898b2fbe4d910619bcbf35bf4bcd 100644
index 3f6697d21cf32b83d3dcd74d810effc28c9efc95..060676e094c425ab11889ee221808e5814d34f43 100644
--- a/src/main/java/net/minecraft/world/entity/monster/hoglin/Hoglin.java
+++ b/src/main/java/net/minecraft/world/entity/monster/hoglin/Hoglin.java
@@ -67,6 +67,18 @@ public class Hoglin extends Animal implements Enemy, HoglinBase {
@@ -4309,6 +4309,14 @@ index c510da19883d1aa79b2fc25e2d9c8f5cd8dd7bfa..b5773abd11ee898b2fbe4d910619bcbf
@Override
public boolean canBeLeashed(Player player) {
return !this.isLeashed();
@@ -130,6 +142,7 @@ public class Hoglin extends Animal implements Enemy, HoglinBase {
@Override
protected void customServerAiStep() {
this.level.getProfiler().push("hoglinBrain");
+ if (getRider() == null) // Purpur - only use brain if no rider
if (this.behaviorTick++ % this.activatedPriority == 0) // Airplane
this.getBrain().tick((ServerLevel)this.level, this);
this.level.getProfiler().pop();
diff --git a/src/main/java/net/minecraft/world/entity/monster/piglin/Piglin.java b/src/main/java/net/minecraft/world/entity/monster/piglin/Piglin.java
index 06c6ed64488bb3685b9de3e05d8a1e74ebc62e37..ace6891fd0e14af5268249b60e14a99c17a2f435 100644
--- a/src/main/java/net/minecraft/world/entity/monster/piglin/Piglin.java