mirror of
https://github.com/PurpurMC/Purpur.git
synced 2026-02-20 18:07:43 +01:00
Fix idle timer not resetting while riding mobs
This commit is contained in:
@@ -1,4 +1,4 @@
|
|||||||
From b3e0e8e52c442500c89de8a0e66adf5e1fc2e5bb Mon Sep 17 00:00:00 2001
|
From 71031b29021f6399ec74e28c175b70c10578494b Mon Sep 17 00:00:00 2001
|
||||||
From: William Blake Galbreath <Blake.Galbreath@GMail.com>
|
From: William Blake Galbreath <Blake.Galbreath@GMail.com>
|
||||||
Date: Thu, 6 Feb 2020 19:53:59 -0600
|
Date: Thu, 6 Feb 2020 19:53:59 -0600
|
||||||
Subject: [PATCH] Ridables
|
Subject: [PATCH] Ridables
|
||||||
@@ -54,6 +54,7 @@ Subject: [PATCH] Ridables
|
|||||||
.../java/net/minecraft/server/EntityPig.java | 48 +-
|
.../java/net/minecraft/server/EntityPig.java | 48 +-
|
||||||
.../net/minecraft/server/EntityPigZombie.java | 17 +
|
.../net/minecraft/server/EntityPigZombie.java | 17 +
|
||||||
.../net/minecraft/server/EntityPillager.java | 19 +
|
.../net/minecraft/server/EntityPillager.java | 19 +
|
||||||
|
.../net/minecraft/server/EntityPlayer.java | 2 +-
|
||||||
.../net/minecraft/server/EntityPolarBear.java | 42 ++
|
.../net/minecraft/server/EntityPolarBear.java | 42 ++
|
||||||
.../minecraft/server/EntityPufferFish.java | 19 +-
|
.../minecraft/server/EntityPufferFish.java | 19 +-
|
||||||
.../net/minecraft/server/EntityRabbit.java | 79 ++-
|
.../net/minecraft/server/EntityRabbit.java | 79 ++-
|
||||||
@@ -101,7 +102,7 @@ Subject: [PATCH] Ridables
|
|||||||
.../net/pl3x/purpur/entity/DolphinSpit.java | 119 ++++
|
.../net/pl3x/purpur/entity/DolphinSpit.java | 119 ++++
|
||||||
.../pathfinder/PathfinderGoalHasRider.java | 21 +
|
.../pathfinder/PathfinderGoalHasRider.java | 21 +
|
||||||
.../craftbukkit/entity/CraftEntity.java | 27 +
|
.../craftbukkit/entity/CraftEntity.java | 27 +
|
||||||
97 files changed, 3402 insertions(+), 203 deletions(-)
|
98 files changed, 3403 insertions(+), 204 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
|
||||||
@@ -3318,6 +3319,26 @@ index 0357c9da93..98a657cece 100644
|
|||||||
this.targetSelector.a(1, (new PathfinderGoalHurtByTarget(this, new Class[]{EntityRaider.class})).a(new Class[0])); // CraftBukkit - decompile error
|
this.targetSelector.a(1, (new PathfinderGoalHurtByTarget(this, new Class[]{EntityRaider.class})).a(new Class[0])); // CraftBukkit - decompile error
|
||||||
this.targetSelector.a(2, new PathfinderGoalNearestAttackableTarget<>(this, EntityHuman.class, true));
|
this.targetSelector.a(2, new PathfinderGoalNearestAttackableTarget<>(this, EntityHuman.class, true));
|
||||||
this.targetSelector.a(3, new PathfinderGoalNearestAttackableTarget<>(this, EntityVillagerAbstract.class, false));
|
this.targetSelector.a(3, new PathfinderGoalNearestAttackableTarget<>(this, EntityVillagerAbstract.class, false));
|
||||||
|
diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
|
||||||
|
index d49c45ce7f..cf37baee39 100644
|
||||||
|
--- a/src/main/java/net/minecraft/server/EntityPlayer.java
|
||||||
|
+++ b/src/main/java/net/minecraft/server/EntityPlayer.java
|
||||||
|
@@ -1322,6 +1322,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
|
||||||
|
}
|
||||||
|
|
||||||
|
public void a(float f, float f1, boolean flag, boolean flag1) {
|
||||||
|
+ if (aZ != f || bb != f1 || jumping != flag || isSneaking() != flag1) resetIdleTimer(); // Purpur
|
||||||
|
if (this.isPassenger()) {
|
||||||
|
if (f >= -1.0F && f <= 1.0F) {
|
||||||
|
this.aZ = f;
|
||||||
|
@@ -1334,7 +1335,6 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
|
||||||
|
this.jumping = flag;
|
||||||
|
this.setSneaking(flag1);
|
||||||
|
}
|
||||||
|
-
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
diff --git a/src/main/java/net/minecraft/server/EntityPolarBear.java b/src/main/java/net/minecraft/server/EntityPolarBear.java
|
diff --git a/src/main/java/net/minecraft/server/EntityPolarBear.java b/src/main/java/net/minecraft/server/EntityPolarBear.java
|
||||||
index f8e29a02d3..0a3906bde0 100644
|
index f8e29a02d3..0a3906bde0 100644
|
||||||
--- a/src/main/java/net/minecraft/server/EntityPolarBear.java
|
--- a/src/main/java/net/minecraft/server/EntityPolarBear.java
|
||||||
|
|||||||
Reference in New Issue
Block a user