diff options
| author | Nassim Jahnke <[email protected]> | 2022-10-02 09:56:36 +0200 |
|---|---|---|
| committer | GitHub <[email protected]> | 2022-10-02 09:56:36 +0200 |
| commit | 928bcc8d3a058221146cea1de7d42d7e178e78f2 (patch) | |
| tree | fdb518a8812097f983c41d36ea693baf5c208554 /patches/server/0562-Configurable-max-leash-distance.patch | |
| parent | ec3cfa9b7f147cf097692144f665893748fadc3b (diff) | |
| download | Paper-928bcc8d3a058221146cea1de7d42d7e178e78f2.tar.gz Paper-928bcc8d3a058221146cea1de7d42d7e178e78f2.zip | |
Updated Upstream (Bukkit/CraftBukkit) (#8430)
Upstream has released updates that appear to apply and compile correctly.
This update has not been tested by PaperMC and as with ANY update, please do your own testing
Bukkit Changes:
09943450 Update SnakeYAML version
5515734f SPIGOT-7162: Incorrect description for Entity#getVehicle javadoc
6f82b381 PR-788: Add getHand() to all relevant events
CraftBukkit Changes:
aaf484f6f SPIGOT-7163: CraftMerchantRecipe doesn't copy demand and specialPrice from BukkitMerchantRecipe
5329dd6fd PR-1107: Add getHand() to all relevant events
93061706e SPIGOT-7045: Ocelots never spawn with babies with spawn reason OCELOT_BABY
Diffstat (limited to 'patches/server/0562-Configurable-max-leash-distance.patch')
| -rw-r--r-- | patches/server/0562-Configurable-max-leash-distance.patch | 28 |
1 files changed, 0 insertions, 28 deletions
diff --git a/patches/server/0562-Configurable-max-leash-distance.patch b/patches/server/0562-Configurable-max-leash-distance.patch deleted file mode 100644 index ba76f79b7f..0000000000 --- a/patches/server/0562-Configurable-max-leash-distance.patch +++ /dev/null @@ -1,28 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Jake Potrebic <[email protected]> -Date: Sun, 3 Jan 2021 21:04:03 -0800 -Subject: [PATCH] Configurable max leash distance - - -diff --git a/src/main/java/net/minecraft/world/entity/PathfinderMob.java b/src/main/java/net/minecraft/world/entity/PathfinderMob.java -index 3db309e709cd72e3aae184ff2f8b1a7b98f2c7a8..15f56707a1f06f5c33f231a15a6c5f4b4a85cb4e 100644 ---- a/src/main/java/net/minecraft/world/entity/PathfinderMob.java -+++ b/src/main/java/net/minecraft/world/entity/PathfinderMob.java -@@ -48,7 +48,7 @@ public abstract class PathfinderMob extends Mob { - float f = this.distanceTo(entity); - - if (this instanceof TamableAnimal && ((TamableAnimal) this).isInSittingPose()) { -- if (f > 10.0F) { -+ if (f > entity.level.paperConfig().misc.maxLeashDistance) { // Paper - this.level.getCraftServer().getPluginManager().callEvent(new EntityUnleashEvent(this.getBukkitEntity(), EntityUnleashEvent.UnleashReason.DISTANCE)); // CraftBukkit - this.dropLeash(true, true); - } -@@ -57,7 +57,7 @@ public abstract class PathfinderMob extends Mob { - } - - this.onLeashDistance(f); -- if (f > 10.0F) { -+ if (f > entity.level.paperConfig().misc.maxLeashDistance) { // Paper - this.level.getCraftServer().getPluginManager().callEvent(new EntityUnleashEvent(this.getBukkitEntity(), EntityUnleashEvent.UnleashReason.DISTANCE)); // CraftBukkit - this.dropLeash(true, true); - this.goalSelector.disableControlFlag(Goal.Flag.MOVE); |