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

compile

Browse Source
This commit is contained in:
Ben Kerllenevich
2021-11-25 09:03:05 -05:00
parent a7f145d54c
commit 708c0d05bf
6 changed files with 28 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
patches/server/0006-Ridables.patch
View File

@@ -86,7 +86,7 @@ index 23074f0b00cde60e3a42335c7aa3eb4f6162d44d..56015828fe1f0bf66eefa41164e58cc4
if ((entity instanceof AbstractFish && origItem != null && origItem.asItem() == Items.WATER_BUCKET) && (event.isCancelled() || ServerGamePacketListenerImpl.this.player.getInventory().getSelected() == null || ServerGamePacketListenerImpl.this.player.getInventory().getSelected().getItem() != origItem)) {
ServerGamePacketListenerImpl.this.send(new ClientboundAddMobPacket((AbstractFish) entity));
diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
index 23c17a1ebb63290168b2b67f2dbeb7741c368e7b..20930c864ee1cb39367b5515dc8579f31d40ad21 100644
index 23c17a1ebb63290168b2b67f2dbeb7741c368e7b..8389be51e564c734b899ee1049eeb811d111d263 100644
--- a/src/main/java/net/minecraft/world/entity/Entity.java
+++ b/src/main/java/net/minecraft/world/entity/Entity.java
@@ -230,7 +230,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, i
@@ -155,7 +155,7 @@ index 23c17a1ebb63290168b2b67f2dbeb7741c368e7b..20930c864ee1cb39367b5515dc8579f3
+
+ public void onMount(Player rider) {
+ if (this instanceof Mob) {
+ ((Mob) this).setGoalTarget(null, null, false);
+ ((Mob) this).setTarget(null, null, false);
+ ((Mob) this).getNavigation().stop();
+ }
+ rider.setJumping(false); // fixes jump on mount
@@ -2517,7 +2517,7 @@ index e17a3afa41fd628d2c4a3637ae19418e258a99b8..6a39bd861f27d517f8de9fc3f589c7e2
this.dragonFight.updateDragon(this);
}
diff --git a/src/main/java/net/minecraft/world/entity/boss/wither/WitherBoss.java b/src/main/java/net/minecraft/world/entity/boss/wither/WitherBoss.java
index ede0ced64d74d71547d1b8bb6853c5aacc1b486a..318bf2a0feea7b5eb15b56565d4aecc4cd2eb2b4 100644
index ede0ced64d74d71547d1b8bb6853c5aacc1b486a..ba20d4bddf965a9207fa0f12f7337f51a8aff301 100644
--- a/src/main/java/net/minecraft/world/entity/boss/wither/WitherBoss.java
+++ b/src/main/java/net/minecraft/world/entity/boss/wither/WitherBoss.java
@@ -85,6 +85,7 @@ public class WitherBoss extends Monster implements PowerableMob, RangedAttackMob
@@ -2528,11 +2528,12 @@ index ede0ced64d74d71547d1b8bb6853c5aacc1b486a..318bf2a0feea7b5eb15b56565d4aecc4
// Paper start
private boolean canPortal = false;
@@ -107,15 +108,117 @@ public class WitherBoss extends Monster implements PowerableMob, RangedAttackMob
@@ -106,16 +107,118 @@ public class WitherBoss extends Monster implements PowerableMob, RangedAttackMob
navigationflying.setCanOpenDoors(false);
navigationflying.setCanFloat(true);
navigationflying.setCanPassDoors(true);
return navigationflying;
+ this.moveControl = new net.pl3x.purpur.controller.FlyingWithSpacebarMoveControllerWASD(this, 0.1F); // Purpur
return navigationflying;
}
+ // Purpur start