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

Fix some pathfinders firing even when mounted

Browse Source
This commit is contained in:
William Blake Galbreath
2019-08-10 20:30:15 -05:00
parent f1e93a7325
commit 9da734157d
1 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,4 +1,4 @@
From 855ab1241e8756277c826720d9d4ecb282bb0c7d Mon Sep 17 00:00:00 2001 From f76fd5d572d79451fb1c06d8ab241e52054a8505 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
@@ -80,10 +80,10 @@ Subject: [PATCH] Integrate ridables
.../controller/ControllerMoveWASDFlying.java | 62 +++++++++ .../controller/ControllerMoveWASDFlying.java | 62 +++++++++
.../ControllerMoveWASDFlyingWithSpacebar.java | 65 ++++++++++ .../ControllerMoveWASDFlyingWithSpacebar.java | 65 ++++++++++
.../controller/ControllerMoveWASDWater.java | 42 ++++++ .../controller/ControllerMoveWASDWater.java | 42 ++++++
.../pathfinder/PathfinderGoalHasRider.java | 17 +++ .../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, 1253 insertions(+), 114 deletions(-) 79 files changed, 1256 insertions(+), 114 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
@@ -3149,20 +3149,23 @@ index 000000000..74ff48259
+} +}
diff --git a/src/main/java/net/pl3x/purpur/pathfinder/PathfinderGoalHasRider.java b/src/main/java/net/pl3x/purpur/pathfinder/PathfinderGoalHasRider.java diff --git a/src/main/java/net/pl3x/purpur/pathfinder/PathfinderGoalHasRider.java b/src/main/java/net/pl3x/purpur/pathfinder/PathfinderGoalHasRider.java
new file mode 100644 new file mode 100644
index 000000000..93d27ecc5 index 000000000..e3a9fd9d2
--- /dev/null --- /dev/null
+++ b/src/main/java/net/pl3x/purpur/pathfinder/PathfinderGoalHasRider.java +++ b/src/main/java/net/pl3x/purpur/pathfinder/PathfinderGoalHasRider.java
@@ -0,0 +1,17 @@ @@ -0,0 +1,20 @@
+package net.pl3x.purpur.pathfinder; +package net.pl3x.purpur.pathfinder;
+ +
+import net.minecraft.server.Entity; +import net.minecraft.server.Entity;
+import net.minecraft.server.PathfinderGoal; +import net.minecraft.server.PathfinderGoal;
+ +
+import java.util.EnumSet;
+
+public class PathfinderGoalHasRider extends PathfinderGoal { +public class PathfinderGoalHasRider extends PathfinderGoal {
+ public final Entity entity; + public final Entity entity;
+ +
+ public PathfinderGoalHasRider(Entity entity) { + public PathfinderGoalHasRider(Entity entity) {
+ this.entity = entity; + this.entity = entity;
+ this.a(EnumSet.of(Type.JUMP, Type.MOVE, Type.LOOK, Type.TARGET));
+ } + }
+ +
+ @Override + @Override