mirror of
https://github.com/Winds-Studio/Leaf.git
synced 2026-01-06 15:51:31 +00:00
f5b95a6716
Upstream has released updates that appear to apply and compile correctly Paper Changes: PaperMC/Paper@b0da38c2 Repository details in RuntimeException for MavenLibraryResolver#addRepository (#12939) PaperMC/Paper@1922be90 Update custom tags (#12183) PaperMC/Paper@79cf1353 Ignore HopperInventorySearchEvent when it has no listeners (#13009) PaperMC/Paper@ea014f7a feat: add stuckEntityPoiRetryDelay config (#12949) PaperMC/Paper@a9e76749 Support for showNotification in PlayerRecipeDiscoverEvent (#12992) PaperMC/Paper@5622c9dd Expose attribute sentiment (#12974) PaperMC/Paper@42b653b1 Expose more argument types (#12665) PaperMC/Paper@52d9a221 [ci/skip] Fix typo in Display javadoc (#13010) PaperMC/Paper@614e9acf Improve APIs around riptide tridents (#12996) PaperMC/Paper@51706e5a Fixed DyeItem sheep dye hunk
34 lines
2.1 KiB
Diff
34 lines
2.1 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: HaHaWTH <102713261+HaHaWTH@users.noreply.github.com>
|
|
Date: Tue, 9 Nov 2077 00:00:00 +0800
|
|
Subject: [PATCH] Fix Paper config fixClimbingBypassingCrammingRule
|
|
|
|
Waiting for Paper#12793
|
|
|
|
diff --git a/net/minecraft/world/entity/LivingEntity.java b/net/minecraft/world/entity/LivingEntity.java
|
|
index d2e0fc60575a52b8daef07f00df8991ec5462379..09e0b1bb9f8e4605097af6466681f9aec4e0204f 100644
|
|
--- a/net/minecraft/world/entity/LivingEntity.java
|
|
+++ b/net/minecraft/world/entity/LivingEntity.java
|
|
@@ -3844,7 +3844,7 @@ public abstract class LivingEntity extends Entity implements Attackable, Waypoin
|
|
// Leaf start - Only player pushable
|
|
final AABB box = this.getBoundingBox();
|
|
List<Entity> pushableEntities = org.dreeam.leaf.config.modules.gameplay.OnlyPlayerPushable.enabled
|
|
- ? getNearbyPushablePlayers(this, box, EntitySelector.pushableBy(this))
|
|
+ ? getNearbyPushablePlayers(this, box, EntitySelector.pushable(this, this.level().paperConfig().collisions.fixClimbingBypassingCrammingRule)) // Leaf - Fix Paper config fixClimbingBypassingCrammingRule
|
|
: this.level().getPushableEntities(this, box);
|
|
// Leaf end - Only player pushable
|
|
if (!pushableEntities.isEmpty()) {
|
|
diff --git a/net/minecraft/world/level/Level.java b/net/minecraft/world/level/Level.java
|
|
index 38a6ca1c0789e50ca15f7a5e602da9be5f8371e9..afebf43067f13493d06e6c0620058c135eb9b880 100644
|
|
--- a/net/minecraft/world/level/Level.java
|
|
+++ b/net/minecraft/world/level/Level.java
|
|
@@ -1907,7 +1907,7 @@ public abstract class Level implements LevelAccessor, UUIDLookup<Entity>, AutoCl
|
|
// Paper end - rewrite chunk system
|
|
|
|
public List<Entity> getPushableEntities(Entity entity, AABB boundingBox) {
|
|
- return this.getEntities(entity, boundingBox, EntitySelector.pushableBy(entity));
|
|
+ return this.getEntities(entity, boundingBox, EntitySelector.pushable(entity, this.paperConfig().collisions.fixClimbingBypassingCrammingRule)); // Leaf - Fix Paper config fixClimbingBypassingCrammingRule
|
|
}
|
|
|
|
@Nullable
|