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

Fix fox bug

Browse Source
This commit is contained in:
William Blake Galbreath
2019-09-13 10:24:27 -05:00
parent 09b1b15283
commit c349c48fb0
1 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
patches/server/0010-Integrate-ridables.patch
View File

@@ -1,4 +1,4 @@
From dffe3b8944d40fb3abe77cbfc920ae0631dbb86a Mon Sep 17 00:00:00 2001 From d8e3436095e2e0b4b6910f143684a9c1fcc07f20 Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <blake.galbreath@gmail.com> From: William Blake Galbreath <blake.galbreath@gmail.com>
Date: Tue, 30 Apr 2019 19:17:21 -0500 Date: Tue, 30 Apr 2019 19:17:21 -0500
Subject: [PATCH] Integrate ridables Subject: [PATCH] Integrate ridables
@@ -22,7 +22,7 @@ Subject: [PATCH] Integrate ridables
.../net/minecraft/server/EntityEndermite.java | 4 +- .../net/minecraft/server/EntityEndermite.java | 4 +-
.../net/minecraft/server/EntityEvoker.java | 4 +- .../net/minecraft/server/EntityEvoker.java | 4 +-
.../java/net/minecraft/server/EntityFish.java | 25 ++-- .../java/net/minecraft/server/EntityFish.java | 25 ++--
.../java/net/minecraft/server/EntityFox.java | 47 +++++-- .../java/net/minecraft/server/EntityFox.java | 48 +++++--
.../net/minecraft/server/EntityGhast.java | 6 +- .../net/minecraft/server/EntityGhast.java | 6 +-
.../minecraft/server/EntityGiantZombie.java | 2 + .../minecraft/server/EntityGiantZombie.java | 2 +
.../net/minecraft/server/EntityGuardian.java | 28 +++- .../net/minecraft/server/EntityGuardian.java | 28 +++-
@@ -83,7 +83,7 @@ Subject: [PATCH] Integrate ridables
.../pathfinder/PathfinderGoalHasRider.java | 20 +++ .../pathfinder/PathfinderGoalHasRider.java | 20 +++
.../craftbukkit/entity/CraftLivingEntity.java | 10 ++ .../craftbukkit/entity/CraftLivingEntity.java | 10 ++
.../bukkit/craftbukkit/entity/CraftMob.java | 12 ++ .../bukkit/craftbukkit/entity/CraftMob.java | 12 ++
79 files changed, 1258 insertions(+), 116 deletions(-) 79 files changed, 1259 insertions(+), 116 deletions(-)
create mode 100644 src/main/java/net/pl3x/purpur/controller/ControllerLookWASD.java 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/ControllerMoveWASD.java
create mode 100644 src/main/java/net/pl3x/purpur/controller/ControllerMoveWASDFlying.java create mode 100644 src/main/java/net/pl3x/purpur/controller/ControllerMoveWASDFlying.java
@@ -773,7 +773,7 @@ index 90479feb4..884d14e1c 100644
this.i.setMot(this.i.getMot().add(0.0D, 0.005D, 0.0D)); this.i.setMot(this.i.getMot().add(0.0D, 0.005D, 0.0D));
} }
diff --git a/src/main/java/net/minecraft/server/EntityFox.java b/src/main/java/net/minecraft/server/EntityFox.java diff --git a/src/main/java/net/minecraft/server/EntityFox.java b/src/main/java/net/minecraft/server/EntityFox.java
index ca38ccf76..e9f6b3931 100644 index ca38ccf76..0a2540ae7 100644
--- a/src/main/java/net/minecraft/server/EntityFox.java --- a/src/main/java/net/minecraft/server/EntityFox.java
+++ b/src/main/java/net/minecraft/server/EntityFox.java +++ b/src/main/java/net/minecraft/server/EntityFox.java
@@ -48,6 +48,7 @@ public class EntityFox extends EntityAnimal { @@ -48,6 +48,7 @@ public class EntityFox extends EntityAnimal {
@@ -849,7 +849,7 @@ index ca38ccf76..e9f6b3931 100644
} }
@Override @Override
@@ -618,7 +625,31 @@ public class EntityFox extends EntityAnimal { @@ -618,7 +625,32 @@ public class EntityFox extends EntityAnimal {
return deathEvent; // Paper return deathEvent; // Paper
} }
@@ -866,6 +866,7 @@ index ca38ccf76..e9f6b3931 100644
+ stopActions(); + stopActions();
+ setChasing(false); + setChasing(false);
+ spit(getEquipment(EnumItemSlot.MAINHAND)); + spit(getEquipment(EnumItemSlot.MAINHAND));
+ setSlot(EnumItemSlot.MAINHAND, ItemStack.NULL_ITEM);
+ super.onMount(entityhuman); + super.onMount(entityhuman);
+ } + }
+ +
@@ -881,7 +882,7 @@ index ca38ccf76..e9f6b3931 100644
double d0 = entityliving.locZ - entityfox.locZ; double d0 = entityliving.locZ - entityfox.locZ;
double d1 = entityliving.locX - entityfox.locX; double d1 = entityliving.locX - entityfox.locX;
double d2 = d0 / d1; double d2 = d0 / d1;
@@ -681,16 +712,16 @@ public class EntityFox extends EntityAnimal { @@ -681,16 +713,16 @@ public class EntityFox extends EntityAnimal {
} }
} }
@@ -901,7 +902,7 @@ index ca38ccf76..e9f6b3931 100644
} }
} }
@@ -1361,16 +1392,16 @@ public class EntityFox extends EntityAnimal { @@ -1361,16 +1393,16 @@ public class EntityFox extends EntityAnimal {
} }
} }