From 2d2e1d4140b686d4eb5b1369715bb3d72ae0a55b Mon Sep 17 00:00:00 2001 From: jmp Date: Sat, 20 Feb 2021 14:48:24 -0800 Subject: [PATCH] Fix Wither and Ender Dragon being able to ride boats when they cannot in Paper/Vanilla --- patches/server/0105-Ridables.patch | 22 ++----------------- ...stomizable-wither-health-and-healing.patch | 2 +- ...-Configurable-entity-base-attributes.patch | 2 +- ...iefing-bypass-to-everything-affected.patch | 4 ++-- 4 files changed, 6 insertions(+), 24 deletions(-) diff --git a/patches/server/0105-Ridables.patch b/patches/server/0105-Ridables.patch index 1be087757..d89bb8e21 100644 --- a/patches/server/0105-Ridables.patch +++ b/patches/server/0105-Ridables.patch @@ -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 diff --git a/patches/server/0110-Customizable-wither-health-and-healing.patch b/patches/server/0110-Customizable-wither-health-and-healing.patch index 7f3b63199..d8b5d670f 100644 --- a/patches/server/0110-Customizable-wither-health-and-healing.patch +++ b/patches/server/0110-Customizable-wither-health-and-healing.patch @@ -6,7 +6,7 @@ Subject: [PATCH] Customizable wither health and healing Adds the ability to customize the health of the wither, as well as the amount that it heals, and how often. diff --git a/src/main/java/net/minecraft/server/EntityWither.java b/src/main/java/net/minecraft/server/EntityWither.java -index 0442b722e5dc7ccc6e607fb3fa7766496b3398d5..9d67ce93573f85d64e8f0a8bd9434c130fc75b17 100644 +index 0715e070c727fc26064f6602e9bad3b2681a6081..6236627b29c5d4c9d2ea67bb3c3926cdb1e0b5ec 100644 --- a/src/main/java/net/minecraft/server/EntityWither.java +++ b/src/main/java/net/minecraft/server/EntityWither.java @@ -150,6 +150,11 @@ public class EntityWither extends EntityMonster implements IRangedEntity { diff --git a/patches/server/0153-Configurable-entity-base-attributes.patch b/patches/server/0153-Configurable-entity-base-attributes.patch index 65cdc533b..c3b8b021f 100644 --- a/patches/server/0153-Configurable-entity-base-attributes.patch +++ b/patches/server/0153-Configurable-entity-base-attributes.patch @@ -188,7 +188,7 @@ index 638efc67d66001ee085957d4698f51a7daac77fc..a766910663e47b05d1e38908b5db7471 @Override diff --git a/src/main/java/net/minecraft/server/EntityEnderDragon.java b/src/main/java/net/minecraft/server/EntityEnderDragon.java -index 17a9217ed2d1677371d12b4ab0552378cd71652f..8e16ae4be41a0f20b057b70e9ef255c548a36f08 100644 +index c10f1f95ac786ae876684507412ea4affed99b1b..06dbb96ff2dfc962dc26b63c8069e3f23c4277b8 100644 --- a/src/main/java/net/minecraft/server/EntityEnderDragon.java +++ b/src/main/java/net/minecraft/server/EntityEnderDragon.java @@ -97,6 +97,11 @@ public class EntityEnderDragon extends EntityInsentient implements IMonster { diff --git a/patches/server/0162-Add-mobGriefing-bypass-to-everything-affected.patch b/patches/server/0162-Add-mobGriefing-bypass-to-everything-affected.patch index 518db284b..e2873237b 100644 --- a/patches/server/0162-Add-mobGriefing-bypass-to-everything-affected.patch +++ b/patches/server/0162-Add-mobGriefing-bypass-to-everything-affected.patch @@ -58,7 +58,7 @@ index 92cca6c44f12a9283988b84681aac760f1c38d7e..31f2ca273eb35aa389caf328abe1b0e8 return true; // Purpur end diff --git a/src/main/java/net/minecraft/server/EntityEnderDragon.java b/src/main/java/net/minecraft/server/EntityEnderDragon.java -index 8e16ae4be41a0f20b057b70e9ef255c548a36f08..87b691afd226ec9c59685261c20454c2d312ca17 100644 +index 06dbb96ff2dfc962dc26b63c8069e3f23c4277b8..8a69e157572d799ce3760d55550cf0c2035da609 100644 --- a/src/main/java/net/minecraft/server/EntityEnderDragon.java +++ b/src/main/java/net/minecraft/server/EntityEnderDragon.java @@ -489,7 +489,7 @@ public class EntityEnderDragon extends EntityInsentient implements IMonster { @@ -246,7 +246,7 @@ index fa0c459dcd773e003a2852c594ec7254e4eb11b8..88eeabeb89fe733c462a667d7564da3b } diff --git a/src/main/java/net/minecraft/server/EntityWither.java b/src/main/java/net/minecraft/server/EntityWither.java -index 9d67ce93573f85d64e8f0a8bd9434c130fc75b17..c6a687ffa92bea750b922dfe92bf715a476967e6 100644 +index 6236627b29c5d4c9d2ea67bb3c3926cdb1e0b5ec..014de51f9b803cda27e735d30cde5c869947a31b 100644 --- a/src/main/java/net/minecraft/server/EntityWither.java +++ b/src/main/java/net/minecraft/server/EntityWither.java @@ -322,7 +322,7 @@ public class EntityWither extends EntityMonster implements IRangedEntity {