Upstream/Paper
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2025-02-09 00:51:39 +01:00
Code Issues Projects Releases Wiki Activity

Merge branch 'master' into pre/1.13

Browse Source 
* master:
  Undo a mistaken chunk registration change - Closes #1302
This commit is contained in:
Aikar 2018-08-04 13:00:26 -04:00
commit e2bc726301
No known key found for this signature in database
GPG Key ID: 401ADFC9891FAAFE
1 changed files with 2 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
Spigot-Server-Patches/0139-Chunk-registration-fixes.patch
View File

@ -1,4 +1,4 @@
From c77ae6f712e3d8402a0aafe3e543cae5b24754d9 Mon Sep 17 00:00:00 2001 From f73d69ae1fe48058ff0764e110a09429773ec48a Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co> From: Aikar <aikar@aikar.co>
Date: Wed, 21 Sep 2016 22:54:28 -0400 Date: Wed, 21 Sep 2016 22:54:28 -0400
Subject: [PATCH] Chunk registration fixes Subject: [PATCH] Chunk registration fixes
@ -8,7 +8,7 @@ World checks and the Chunk Add logic are inconsistent on how Y > 256, < 0, is tr
Keep them consistent Keep them consistent
diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
index e74b53c48..01041ede9 100644 index e74b53c483..20e52fbcc8 100644
--- a/src/main/java/net/minecraft/server/World.java --- a/src/main/java/net/minecraft/server/World.java
+++ b/src/main/java/net/minecraft/server/World.java +++ b/src/main/java/net/minecraft/server/World.java
@@ -1485,7 +1485,7 @@ public abstract class World implements GeneratorAccess, IIBlockAccess, AutoClose @@ -1485,7 +1485,7 @@ public abstract class World implements GeneratorAccess, IIBlockAccess, AutoClose
@ -20,15 +20,6 @@ index e74b53c48..01041ede9 100644
int k = MathHelper.floor(entity.locZ / 16.0D); int k = MathHelper.floor(entity.locZ / 16.0D);
if (!entity.inChunk || entity.ae != i || entity.af != j || entity.ag != k) { if (!entity.inChunk || entity.ae != i || entity.af != j || entity.ag != k) {
@@ -1493,7 +1493,7 @@ public abstract class World implements GeneratorAccess, IIBlockAccess, AutoClose
this.getChunkAt(entity.ae, entity.ag).a(entity, entity.af);
}
- if (!entity.bN() && !this.isChunkLoaded(i, k, true)) {
+ if (false && !entity.bN() && !this.isChunkLoaded(i, k, true)) { // Paper - Always send entities into a new chunk, never lose them
entity.inChunk = false;
} else {
this.getChunkAt(i, k).a(entity);
-- --
2.18.0 2.18.0