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

Fix multiple issues with phantoms

Browse Source
This commit is contained in:
William Blake Galbreath
2020-02-20 14:16:20 -06:00
parent 1fe6a8c4d8
commit 4e5bf94149
4 changed files with 58 additions and 62 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
patches/server/0004-Ridables.patch
View File

@@ -1,4 +1,4 @@
From 93bd02ed77297b7123ec4b9208f2bd43d5a7d827 Mon Sep 17 00:00:00 2001
From 08ce7fec031b626b24d380cac2563cf331672249 Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <Blake.Galbreath@GMail.com>
Date: Thu, 6 Feb 2020 19:53:59 -0600
Subject: [PATCH] Ridables
@@ -47,7 +47,7 @@ Subject: [PATCH] Ridables
.../net/minecraft/server/EntityOcelot.java | 19 +
.../net/minecraft/server/EntityPanda.java | 47 +-
.../net/minecraft/server/EntityParrot.java | 69 ++-
.../net/minecraft/server/EntityPhantom.java | 56 +-
.../net/minecraft/server/EntityPhantom.java | 59 +-
.../java/net/minecraft/server/EntityPig.java | 48 +-
.../net/minecraft/server/EntityPigZombie.java | 17 +
.../net/minecraft/server/EntityPillager.java | 19 +
@@ -95,7 +95,7 @@ Subject: [PATCH] Ridables
.../controller/ControllerMoveWASDWater.java | 43 ++
.../pathfinder/PathfinderGoalHasRider.java | 21 +
.../craftbukkit/entity/CraftEntity.java | 27 +
91 files changed, 3032 insertions(+), 194 deletions(-)
91 files changed, 3035 insertions(+), 194 deletions(-)
create mode 100644 src/main/java/net/pl3x/purpur/controller/ControllerLookWASD.java
create mode 100644 src/main/java/net/pl3x/purpur/controller/ControllerMoveWASD.java
create mode 100644 src/main/java/net/pl3x/purpur/controller/ControllerMoveWASDFlying.java
@@ -2657,7 +2657,7 @@ index 1402087612..95b786a5a6 100644
this.goalSelector.a(2, this.goalSit);
this.goalSelector.a(2, new PathfinderGoalFollowOwner(this, 1.0D, 5.0F, 1.0F, true));
diff --git a/src/main/java/net/minecraft/server/EntityPhantom.java b/src/main/java/net/minecraft/server/EntityPhantom.java
index 90eeddb1af..954edf73f7 100644
index 90eeddb1af..850d5efff1 100644
--- a/src/main/java/net/minecraft/server/EntityPhantom.java
+++ b/src/main/java/net/minecraft/server/EntityPhantom.java
@@ -22,6 +22,28 @@ public class EntityPhantom extends EntityFlying implements IMonster {
@@ -2718,7 +2718,31 @@ index 90eeddb1af..954edf73f7 100644
this.setOnFire(8);
}
@@ -447,14 +472,23 @@ public class EntityPhantom extends EntityFlying implements IMonster {
@@ -215,6 +240,7 @@ public class EntityPhantom extends EntityFlying implements IMonster {
@Override
public boolean a() {
+ if (getRider() != null) return false; // Purpur - pathfinder does not have a flag
if (this.c > 0) {
--this.c;
return false;
@@ -244,6 +270,7 @@ public class EntityPhantom extends EntityFlying implements IMonster {
@Override
public boolean b() {
+ if (getRider() != null) return false; // Purpur - pathfinder does not have a flag
EntityLiving entityliving = EntityPhantom.this.getGoalTarget();
return entityliving != null ? EntityPhantom.this.a(entityliving, PathfinderTargetCondition.a) : false;
@@ -258,6 +285,7 @@ public class EntityPhantom extends EntityFlying implements IMonster {
@Override
public boolean a() {
+ if (getRider() != null) return false; // Purpur - pathfinder does not have a flag
EntityLiving entityliving = EntityPhantom.this.getGoalTarget();
return entityliving != null ? EntityPhantom.this.a(EntityPhantom.this.getGoalTarget(), PathfinderTargetCondition.a) : false;
@@ -447,14 +475,23 @@ public class EntityPhantom extends EntityFlying implements IMonster {
}
}
@@ -2744,7 +2768,7 @@ index 90eeddb1af..954edf73f7 100644
}
class d extends EntityAIBodyControl {
@@ -470,7 +504,7 @@ public class EntityPhantom extends EntityFlying implements IMonster {
@@ -470,7 +507,7 @@ public class EntityPhantom extends EntityFlying implements IMonster {
}
}
@@ -2753,7 +2777,7 @@ index 90eeddb1af..954edf73f7 100644
private float j = 0.1F;
@@ -479,7 +513,19 @@ public class EntityPhantom extends EntityFlying implements IMonster {
@@ -479,7 +516,19 @@ public class EntityPhantom extends EntityFlying implements IMonster {
}
@Override