aboutsummaryrefslogtreecommitdiffhomepage
path: root/patches/server/0920-Add-config-option-for-spider-worldborder-climbing.patch
diff options
context:
space:
mode:
Diffstat (limited to 'patches/server/0920-Add-config-option-for-spider-worldborder-climbing.patch')
-rw-r--r--patches/server/0920-Add-config-option-for-spider-worldborder-climbing.patch40
1 files changed, 40 insertions, 0 deletions
diff --git a/patches/server/0920-Add-config-option-for-spider-worldborder-climbing.patch b/patches/server/0920-Add-config-option-for-spider-worldborder-climbing.patch
new file mode 100644
index 0000000000..38b52c6506
--- /dev/null
+++ b/patches/server/0920-Add-config-option-for-spider-worldborder-climbing.patch
@@ -0,0 +1,40 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: BillyGalbreath <[email protected]>
+Date: Thu, 27 Oct 2022 15:35:47 +0200
+Subject: [PATCH] Add config option for spider worldborder climbing
+
+
+diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
+index a1fd4745063a3e4fbd98600b5725df41817f650f..fbbbb1a02a522f97928ac4b52b625f5bf2bc7537 100644
+--- a/src/main/java/net/minecraft/world/entity/Entity.java
++++ b/src/main/java/net/minecraft/world/entity/Entity.java
+@@ -403,6 +403,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
+ @javax.annotation.Nullable
+ private UUID originWorld;
+ public boolean freezeLocked = false; // Paper - Freeze Tick Lock API
++ public boolean collidingWithWorldBorder; // Paper
+
+ public void setOrigin(@javax.annotation.Nonnull Location location) {
+ this.origin = location.toVector();
+@@ -1469,7 +1470,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
+ io.papermc.paper.util.CollisionUtil.getCollisions(world, this, collisionBox, potentialCollisions, false, this.level.paperConfig().chunks.preventMovingIntoUnloadedChunks,
+ false, false, null, null);
+
+- if (io.papermc.paper.util.CollisionUtil.isCollidingWithBorderEdge(world.getWorldBorder(), collisionBox)) {
++ if (collidingWithWorldBorder = io.papermc.paper.util.CollisionUtil.isCollidingWithBorderEdge(world.getWorldBorder(), collisionBox)) { // Paper - this line *is* correct, ignore the IDE warning about assignments being used as a condition
+ io.papermc.paper.util.CollisionUtil.addBoxesToIfIntersects(world.getWorldBorder().getCollisionShape(), collisionBox, potentialCollisions);
+ }
+
+diff --git a/src/main/java/net/minecraft/world/entity/monster/Spider.java b/src/main/java/net/minecraft/world/entity/monster/Spider.java
+index d506091a739b04caf213e8fb0f71b5b78035aa0e..05432184077752b1d0cb764a5e39ed875748b2d6 100644
+--- a/src/main/java/net/minecraft/world/entity/monster/Spider.java
++++ b/src/main/java/net/minecraft/world/entity/monster/Spider.java
+@@ -84,7 +84,7 @@ public class Spider extends Monster {
+ public void tick() {
+ super.tick();
+ if (!this.level().isClientSide) {
+- this.setClimbing(this.horizontalCollision);
++ this.setClimbing(this.horizontalCollision && (this.level().paperConfig().entities.behavior.allowSpiderWorldBorderClimbing || !collidingWithWorldBorder)); // Paper
+ }
+
+ }