mirror of
https://github.com/PaperMC/Paper.git
synced 2024-09-03 02:20:51 +02:00
If a playerdata doesn't contain a valid, loaded world, reset to the main world spawn point
20 lines
1.0 KiB
Diff
20 lines
1.0 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Shane Freeder <theboyetronic@gmail.com>
|
|
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 1970fa01a6c93f52bbea4874db304c295b3173ba..b28ee70aa98d6a8f3913e11084d0b4a9b09b5e26 100644
|
|
--- a/src/main/java/net/minecraft/world/entity/Entity.java
|
|
+++ b/src/main/java/net/minecraft/world/entity/Entity.java
|
|
@@ -1356,7 +1356,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
|
|
}
|
|
|
|
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) {
|