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

Fix pandas

Browse Source
This commit is contained in:
William Blake Galbreath
2019-06-23 13:30:40 -05:00
parent f870db0c13
commit f3facb0cf3
1 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,4 +1,4 @@
From 4cd56e03a9b64f2ff37640eab922f48e258a1846 Mon Sep 17 00:00:00 2001
From 1f53023bd79aaa06b926af92a6e56b5d703aba64 Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <blake.galbreath@gmail.com>
Date: Tue, 30 Apr 2019 19:17:21 -0500
Subject: [PATCH] Integrate ridables
@@ -37,7 +37,7 @@ Subject: [PATCH] Integrate ridables
.../net/minecraft/server/EntityMagmaCube.java | 3 +-
.../minecraft/server/EntityMushroomCow.java | 1 +
.../net/minecraft/server/EntityOcelot.java | 3 +
.../net/minecraft/server/EntityPanda.java | 39 +++++-
.../net/minecraft/server/EntityPanda.java | 41 +++++-
.../net/minecraft/server/EntityParrot.java | 5 +-
.../net/minecraft/server/EntityPhantom.java | 41 +++++-
.../java/net/minecraft/server/EntityPig.java | 34 +++--
@@ -134,7 +134,7 @@ Subject: [PATCH] Integrate ridables
.../controller/ControllerMoveWASDWater.java | 42 +++++++
.../craftbukkit/entity/CraftLivingEntity.java | 10 ++
.../bukkit/craftbukkit/entity/CraftMob.java | 12 ++
130 files changed, 1234 insertions(+), 105 deletions(-)
130 files changed, 1235 insertions(+), 106 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
@@ -1806,7 +1806,7 @@ index 1713bead27..e3a9a3f3d2 100644
}
}
diff --git a/src/main/java/net/minecraft/server/EntityPanda.java b/src/main/java/net/minecraft/server/EntityPanda.java
index b46ca388eb..0585865f95 100644
index b46ca388eb..1d6b9a226b 100644
--- a/src/main/java/net/minecraft/server/EntityPanda.java
+++ b/src/main/java/net/minecraft/server/EntityPanda.java
@@ -37,6 +37,7 @@ public class EntityPanda extends EntityAnimal {
@@ -1994,15 +1994,18 @@ index b46ca388eb..0585865f95 100644
private final EntityPanda i;
@@ -967,7 +996,7 @@ public class EntityPanda extends EntityAnimal {
@@ -967,9 +996,9 @@ public class EntityPanda extends EntityAnimal {
}
@Override
- public void a() {
+ public void tick() { // Purpur
if (this.i.eq()) {
super.a();
- super.a();
+ super.tick(); // Purpur
}
}
}
diff --git a/src/main/java/net/minecraft/server/EntityParrot.java b/src/main/java/net/minecraft/server/EntityParrot.java
index 6173a86e09..c6c5f66b3c 100644
--- a/src/main/java/net/minecraft/server/EntityParrot.java