mirror of
https://github.com/PurpurMC/Purpur.git
synced 2026-02-20 09:57:43 +01:00
Fix riding spiders and cave spiders
This commit is contained in:
@@ -1,4 +1,4 @@
|
|||||||
From 307f171f530a56aab0739c71f513301743f613fc Mon Sep 17 00:00:00 2001
|
From 98928c89444ee0675648e369c8a0503bc8196de3 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
|
||||||
@@ -63,7 +63,7 @@ Subject: [PATCH] Integrate ridables
|
|||||||
.../server/EntitySkeletonWither.java | 1 +
|
.../server/EntitySkeletonWither.java | 1 +
|
||||||
.../net/minecraft/server/EntitySlime.java | 3 +-
|
.../net/minecraft/server/EntitySlime.java | 3 +-
|
||||||
.../net/minecraft/server/EntitySnowman.java | 2 +
|
.../net/minecraft/server/EntitySnowman.java | 2 +
|
||||||
.../net/minecraft/server/EntitySpider.java | 1 +
|
.../net/minecraft/server/EntitySpider.java | 3 +
|
||||||
.../net/minecraft/server/EntitySquid.java | 47 ++++++
|
.../net/minecraft/server/EntitySquid.java | 47 ++++++
|
||||||
.../server/EntityTameableAnimal.java | 6 +
|
.../server/EntityTameableAnimal.java | 6 +
|
||||||
.../minecraft/server/EntityTropicalFish.java | 1 +
|
.../minecraft/server/EntityTropicalFish.java | 1 +
|
||||||
@@ -105,7 +105,7 @@ Subject: [PATCH] Integrate ridables
|
|||||||
.../controller/ControllerMoveWASDWater.java | 42 ++++++
|
.../controller/ControllerMoveWASDWater.java | 42 ++++++
|
||||||
.../craftbukkit/entity/CraftLivingEntity.java | 10 ++
|
.../craftbukkit/entity/CraftLivingEntity.java | 10 ++
|
||||||
.../bukkit/craftbukkit/entity/CraftMob.java | 12 ++
|
.../bukkit/craftbukkit/entity/CraftMob.java | 12 ++
|
||||||
101 files changed, 1075 insertions(+), 107 deletions(-)
|
101 files changed, 1077 insertions(+), 107 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
|
||||||
@@ -2003,7 +2003,7 @@ index fb36306b9..271b952b2 100644
|
|||||||
|
|
||||||
for (int l = 0; l < 4; ++l) {
|
for (int l = 0; l < 4; ++l) {
|
||||||
diff --git a/src/main/java/net/minecraft/server/EntitySpider.java b/src/main/java/net/minecraft/server/EntitySpider.java
|
diff --git a/src/main/java/net/minecraft/server/EntitySpider.java b/src/main/java/net/minecraft/server/EntitySpider.java
|
||||||
index b560a8969..aa46cb7ea 100644
|
index b560a8969..43b1f443d 100644
|
||||||
--- a/src/main/java/net/minecraft/server/EntitySpider.java
|
--- a/src/main/java/net/minecraft/server/EntitySpider.java
|
||||||
+++ b/src/main/java/net/minecraft/server/EntitySpider.java
|
+++ b/src/main/java/net/minecraft/server/EntitySpider.java
|
||||||
@@ -9,6 +9,7 @@ public class EntitySpider extends EntityMonster {
|
@@ -9,6 +9,7 @@ public class EntitySpider extends EntityMonster {
|
||||||
@@ -2014,6 +2014,22 @@ index b560a8969..aa46cb7ea 100644
|
|||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
@@ -160,6 +161,7 @@ public class EntitySpider extends EntityMonster {
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public boolean a() {
|
||||||
|
+ if (this.e.getRider() != null) return false; // Purpur
|
||||||
|
float f = this.e.aE();
|
||||||
|
|
||||||
|
return f >= 0.5F ? false : super.a();
|
||||||
|
@@ -179,6 +181,7 @@ public class EntitySpider extends EntityMonster {
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public boolean b() {
|
||||||
|
+ if (this.a.getRider() != null) return false; // Purpur
|
||||||
|
float f = this.a.aE();
|
||||||
|
|
||||||
|
if (f >= 0.5F && this.a.getRandom().nextInt(100) == 0) {
|
||||||
diff --git a/src/main/java/net/minecraft/server/EntitySquid.java b/src/main/java/net/minecraft/server/EntitySquid.java
|
diff --git a/src/main/java/net/minecraft/server/EntitySquid.java b/src/main/java/net/minecraft/server/EntitySquid.java
|
||||||
index 77c0ed42f..e06282fdf 100644
|
index 77c0ed42f..e06282fdf 100644
|
||||||
--- a/src/main/java/net/minecraft/server/EntitySquid.java
|
--- a/src/main/java/net/minecraft/server/EntitySquid.java
|
||||||
|
|||||||
Reference in New Issue
Block a user