mirror of
https://github.com/PaperMC/Paper.git
synced 2024-12-23 09:27:45 +01:00
70ad51a80c
Upstream has released updates that appears to apply and compile correctly.
This update has not been tested by PaperMC and as with ANY update, please do your own testing
My recent work on serialization is now in CraftBukkit so was able to drop the patch and Paper
is now consistent with upstream.
Bukkit Changes:
e2699636 Move API notes to more obvious location
CraftBukkit Changes:
1b2830a3 SPIGOT-4441: Fix serializing Components to and from Legacy
59 lines
3.1 KiB
Diff
59 lines
3.1 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/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
|
|
index 751551f173338217f6682532a9a5e1a269415177..eae1690cc6db99b2f3af70a121f83b455b0fb20d 100644
|
|
--- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
|
|
+++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
|
|
@@ -328,4 +328,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 0e8ba05455161883c86df6606104fab3529c3c0c..ad79e4521cee699de86a94885b27356339bcb866 100644
|
|
--- a/src/main/java/net/minecraft/server/EntityHuman.java
|
|
+++ b/src/main/java/net/minecraft/server/EntityHuman.java
|
|
@@ -463,7 +463,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.abilities.isFlying || this.isSleeping()) {
|
|
- 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 fbaf234e8400dc14dc2421c87c80eb887ba44fef..08211fd37ab7916586c0579cfb9c014c29553991 100644
|
|
--- a/src/main/java/net/minecraft/server/PlayerConnection.java
|
|
+++ b/src/main/java/net/minecraft/server/PlayerConnection.java
|
|
@@ -1773,6 +1773,13 @@ public class PlayerConnection implements PacketListenerPlayIn {
|
|
switch (packetplayinentityaction.c()) {
|
|
case PRESS_SHIFT_KEY:
|
|
this.player.setSneaking(true);
|
|
+
|
|
+ // Paper start - Hang on!
|
|
+ if (this.player.world.paperConfig.parrotsHangOnBetter) {
|
|
+ this.player.releaseShoulderEntities();
|
|
+ }
|
|
+ // Paper end
|
|
+
|
|
break;
|
|
case RELEASE_SHIFT_KEY:
|
|
this.player.setSneaking(false);
|