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

Fix Wither and Ender Dragon being able to ride boats when they cannot in Paper/Vanilla

Browse Source
This commit is contained in:
jmp
2021-02-20 14:48:24 -08:00
parent 40868883d9
commit 2d2e1d4140
4 changed files with 6 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
patches/server/0105-Ridables.patch
View File

@@ -1184,7 +1184,7 @@ index 1a102816921fa3b40f6d364bb826db4459f68eb2..125eab60f2b4657e52a71eddf7586c57
@Override
diff --git a/src/main/java/net/minecraft/server/EntityEnderDragon.java b/src/main/java/net/minecraft/server/EntityEnderDragon.java
index a5a2182455542bb8fd62941bd0da2f38ba698f35..17a9217ed2d1677371d12b4ab0552378cd71652f 100644
index a5a2182455542bb8fd62941bd0da2f38ba698f35..c10f1f95ac786ae876684507412ea4affed99b1b 100644
--- a/src/main/java/net/minecraft/server/EntityEnderDragon.java
+++ b/src/main/java/net/minecraft/server/EntityEnderDragon.java
@@ -46,6 +46,7 @@ public class EntityEnderDragon extends EntityInsentient implements IMonster {
@@ -1325,15 +1325,6 @@ index a5a2182455542bb8fd62941bd0da2f38ba698f35..17a9217ed2d1677371d12b4ab0552378
if (this.bF != null) {
this.bF.b(this);
}
@@ -949,7 +1018,7 @@ public class EntityEnderDragon extends EntityInsentient implements IMonster {
@Override
protected boolean n(Entity entity) {
- return false;
+ return getRideCooldown() <= 0; // Purpur
}
@Override
diff --git a/src/main/java/net/minecraft/server/EntityEnderman.java b/src/main/java/net/minecraft/server/EntityEnderman.java
index e3364032669b473c799b759f5f89468b7584d9f5..995849212c25568d3aa28ada78babf8b8e669960 100644
--- a/src/main/java/net/minecraft/server/EntityEnderman.java
@@ -4487,7 +4478,7 @@ index ca3c5150bcfe2a92b49ad5a27c23dd37a7054fbb..323d79a99402b0f6952b4fb873170069
this.targetSelector.a(2, this.br);
this.targetSelector.a(3, this.bs);
diff --git a/src/main/java/net/minecraft/server/EntityWither.java b/src/main/java/net/minecraft/server/EntityWither.java
index 2e623ef9be036ea467e9e41817c2eced018f8f93..0442b722e5dc7ccc6e607fb3fa7766496b3398d5 100644
index 2e623ef9be036ea467e9e41817c2eced018f8f93..0715e070c727fc26064f6602e9bad3b2681a6081 100644
--- a/src/main/java/net/minecraft/server/EntityWither.java
+++ b/src/main/java/net/minecraft/server/EntityWither.java
@@ -32,6 +32,7 @@ public class EntityWither extends EntityMonster implements IRangedEntity {
@@ -4685,15 +4676,6 @@ index 2e623ef9be036ea467e9e41817c2eced018f8f93..0442b722e5dc7ccc6e607fb3fa776649
}
public final boolean isPowered() { return this.S_(); } // Paper - OBFHELPER
@@ -547,7 +665,7 @@ public class EntityWither extends EntityMonster implements IRangedEntity {
@Override
protected boolean n(Entity entity) {
- return false;
+ return getRideCooldown() <= 0; // Purpur
}
@Override
diff --git a/src/main/java/net/minecraft/server/EntityWolf.java b/src/main/java/net/minecraft/server/EntityWolf.java
index dcbb34313fedb21e180a0b76610a787e6419d404..9ae7168595dd66860e09ef87f946b18b010e54b1 100644
--- a/src/main/java/net/minecraft/server/EntityWolf.java