diff options
| author | Nassim Jahnke <[email protected]> | 2024-06-16 12:56:00 +0200 |
|---|---|---|
| committer | Nassim Jahnke <[email protected]> | 2024-06-16 12:56:00 +0200 |
| commit | dc684c60d16f66ea84467ec8e253f2a36a17a7c8 (patch) | |
| tree | e516f1bd4bfbdb37a5aeee42384aade111eca3e1 /patches/server/0839-Don-t-load-chunks-for-supporting-block-checks.patch | |
| parent | 752f957e12e4ceb8b7d2043a4a7dbce786b7b98f (diff) | |
| download | Paper-dc684c60d16f66ea84467ec8e253f2a36a17a7c8.tar.gz Paper-dc684c60d16f66ea84467ec8e253f2a36a17a7c8.zip | |
Remove bad server.scheduleOnMain disconnect calls from old patches
The new behavior of disconnect to block the current thread until the disconnect succeeded is better than throwing it off to happen at some point
Diffstat (limited to 'patches/server/0839-Don-t-load-chunks-for-supporting-block-checks.patch')
| -rw-r--r-- | patches/server/0839-Don-t-load-chunks-for-supporting-block-checks.patch | 19 |
1 files changed, 19 insertions, 0 deletions
diff --git a/patches/server/0839-Don-t-load-chunks-for-supporting-block-checks.patch b/patches/server/0839-Don-t-load-chunks-for-supporting-block-checks.patch new file mode 100644 index 0000000000..f674b02e68 --- /dev/null +++ b/patches/server/0839-Don-t-load-chunks-for-supporting-block-checks.patch @@ -0,0 +1,19 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Shane Freeder <[email protected]> +Date: Wed, 5 Jul 2023 23:11:53 +0100 +Subject: [PATCH] Don't load chunks for supporting block checks + + +diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java +index ce648d328ceb7d98fc523398c52915f7e7b5e23e..880546f6727b90ebb021bb0939283739adaa93f6 100644 +--- a/src/main/java/net/minecraft/world/entity/Entity.java ++++ b/src/main/java/net/minecraft/world/entity/Entity.java +@@ -1186,7 +1186,7 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess + } + + protected BlockPos getOnPos(float offset) { +- if (this.mainSupportingBlockPos.isPresent()) { ++ if (this.mainSupportingBlockPos.isPresent() && this.level().getChunkIfLoadedImmediately(this.mainSupportingBlockPos.get()) != null) { // Paper - ensure no loads + BlockPos blockposition = (BlockPos) this.mainSupportingBlockPos.get(); + + if (offset <= 1.0E-5F) { |