mirror of
https://github.com/PaperMC/Paper.git
synced 2024-12-26 02:47:44 +01:00
62 lines
2.9 KiB
Diff
62 lines
2.9 KiB
Diff
From 46521311a789974ef5c4375a1988382829afac90 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/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
|
|
index de8362dd..54d67994 100644
|
|
--- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
|
|
+++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
|
|
@@ -321,4 +321,10 @@ public class PaperWorldConfig {
|
|
maxCollisionsPerEntity = getInt( "max-entity-collisions", this.spigotConfig.getInt("max-entity-collisions", 8) );
|
|
log( "Max Entity Collisions: " + maxCollisionsPerEntity );
|
|
}
|
|
+
|
|
+ public boolean parrotsHangOnBetter;
|
|
+ private void parrotsHangOnBetter() {
|
|
+ parrotsHangOnBetter = getBoolean("parrots-are-unaffected-by-player-movement", false);
|
|
+ log("Parrots are unaffected by player movement: " + parrotsHangOnBetter);
|
|
+ }
|
|
}
|
|
diff --git a/src/main/java/net/minecraft/server/EntityHuman.java b/src/main/java/net/minecraft/server/EntityHuman.java
|
|
index 1a1b1dd1..0974135c 100644
|
|
--- a/src/main/java/net/minecraft/server/EntityHuman.java
|
|
+++ b/src/main/java/net/minecraft/server/EntityHuman.java
|
|
@@ -436,7 +436,7 @@ public abstract class EntityHuman extends EntityLiving {
|
|
this.j(this.getShoulderEntityLeft());
|
|
this.j(this.getShoulderEntityRight());
|
|
if (!this.world.isClientSide && (this.fallDistance > 0.5F || this.isInWater() || this.isPassenger()) || this.abilities.isFlying) {
|
|
- this.releaseShoulderEntities();
|
|
+ if (!this.world.paperConfig.parrotsHangOnBetter) this.releaseShoulderEntities(); // Paper - Hang on!
|
|
}
|
|
|
|
}
|
|
diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
|
|
index ac8ab28a..175f685d 100644
|
|
--- a/src/main/java/net/minecraft/server/PlayerConnection.java
|
|
+++ b/src/main/java/net/minecraft/server/PlayerConnection.java
|
|
@@ -1787,6 +1787,13 @@ public class PlayerConnection implements PacketListenerPlayIn {
|
|
switch (packetplayinentityaction.c()) {
|
|
case START_SNEAKING:
|
|
this.player.setSneaking(true);
|
|
+
|
|
+ // Paper start - Hang on!
|
|
+ if (this.player.world.paperConfig.parrotsHangOnBetter) {
|
|
+ this.player.releaseShoulderEntities();
|
|
+ }
|
|
+ // Paper end
|
|
+
|
|
break;
|
|
case STOP_SNEAKING:
|
|
this.player.setSneaking(false);
|
|
--
|
|
2.22.0
|
|
|