mirror of https://github.com/PaperMC/Paper.git
44 lines
2.5 KiB
Diff
44 lines
2.5 KiB
Diff
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||
|
|
From: Zach Brown <zach.brown@destroystokyo.com>
|
||
|
|
Date: Tue, 16 May 2017 21:29:08 -0500
|
||
|
|
Subject: [PATCH] Add option to make parrots stay on shoulders despite movement
|
||
|
|
|
||
|
|
Makes parrots not fall off whenever the player changes height, or touches water, or gets hit by a passing leaf.
|
||
|
|
Instead, switches the behavior so that players have to sneak to make the birds leave.
|
||
|
|
|
||
|
|
I suspect Mojang may switch to this behavior before full release.
|
||
|
|
|
||
|
|
To be converted into a Paper-API event at some point in the future?
|
||
|
|
|
||
|
|
diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
|
||
|
index 9df3561fca35b1649de1545e924bd96ec5f80089..f8955429ec4cfe778de77a7db5fef624c20e4318 100644
|
||
|
|
--- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
|
||
|
|
+++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
|
||
|
|
@@ -2464,6 +2464,13 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
|
||
|
|
switch (packet.getAction()) {
|
||
|
|
case PRESS_SHIFT_KEY:
|
||
|
|
this.player.setShiftKeyDown(true);
|
||
|
|
+
|
||
|
+ // Paper start - Hang on!
|
||
|
+ if (this.player.level.paperConfig().entities.behavior.parrotsAreUnaffectedByPlayerMovement) {
|
||
|
|
+ this.player.removeEntitiesOnShoulder();
|
||
|
|
+ }
|
||
|
|
+ // Paper end
|
||
|
|
+
|
||
|
|
break;
|
||
|
|
case RELEASE_SHIFT_KEY:
|
||
|
|
this.player.setShiftKeyDown(false);
|
||
|
|
diff --git a/src/main/java/net/minecraft/world/entity/player/Player.java b/src/main/java/net/minecraft/world/entity/player/Player.java
|
||
|
index 1e3ac1d2cb5adf4c0fa3b703f2ecdc32cd8ce240..07a8abb714a9dfd470ab0486c336e3b58ea927a1 100644
|
||
|
|
--- a/src/main/java/net/minecraft/world/entity/player/Player.java
|
||
|
|
+++ b/src/main/java/net/minecraft/world/entity/player/Player.java
|
||
|
|
@@ -588,7 +588,7 @@ public abstract class Player extends LivingEntity {
|
||
|
|
this.playShoulderEntityAmbientSound(this.getShoulderEntityLeft());
|
||
|
|
this.playShoulderEntityAmbientSound(this.getShoulderEntityRight());
|
||
|
|
if (!this.level.isClientSide && (this.fallDistance > 0.5F || this.isInWater()) || this.abilities.flying || this.isSleeping() || this.isInPowderSnow) {
|
||
|
|
- this.removeEntitiesOnShoulder();
|
||
|
|
+ if (!this.level.paperConfig().entities.behavior.parrotsAreUnaffectedByPlayerMovement) this.removeEntitiesOnShoulder(); // Paper - Hang on!
|
||
|
|
}
|
||
|
|
|
||
|
|
}
|