Upstream/Minestom
1
0
Fork 0
mirror of https://github.com/Minestom/Minestom.git synced 2024-09-27 14:13:24 +02:00
Code Issues Projects Releases Wiki Activity

Throw an exception when an entity tries to move in an unloaded chunk

Browse Source
This commit is contained in:
Felix Cravic 2020-12-12 00:10:42 +01:00
parent 44096ff9cf
commit 77b4fe7287
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/main/java/net/minestom/server/entity/Entity.java
View File

@ -1079,9 +1079,11 @@ public abstract class Entity implements Viewable, EventHandler, DataContainer, P
final Chunk lastChunk = instance.getChunkAt(lastX, lastZ);
final Chunk newChunk = instance.getChunkAt(x, z);
final boolean chunkExist = lastChunk != null && newChunk != null;
Check.notNull(lastChunk, "The entity " + getEntityId() + " was in an unloaded chunk at " + lastX + ";" + lastZ);
Check.notNull(newChunk, "The entity " + getEntityId() + " tried to move in an unloaded chunk at " + x + ";" + z);
final boolean chunkChange = lastChunk != newChunk;
if (chunkExist && (forceUpdate || chunkChange)) {
if (forceUpdate || chunkChange) {
instance.switchEntityChunk(this, lastChunk, newChunk);
if (this instanceof Player) {
// Refresh player view