Entonez/KCauldronX
1
0
Fork 0
forked from xjboss/KCauldronX
Code Releases Activity

Fix #319

Browse Source
This commit is contained in:
Sergey Shatunov 2016-02-02 02:21:33 +07:00
parent 9a1b86730d
commit f9b7fa7da4
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
patches/net/minecraft/world/WorldServer.java.patch
View File

@ -423,21 +423,20 @@
} }
this.theProfiler.startSection("cleaning"); this.theProfiler.startSection("cleaning");
@@ -515,14 +706,15 @@ @@ -515,7 +706,7 @@
for (int j = 0; j < i; ++j) for (int j = 0; j < i; ++j)
{ {
nextticklistentry = (NextTickListEntry)this.pendingTickListEntriesTreeSet.first(); nextticklistentry = (NextTickListEntry)this.pendingTickListEntriesTreeSet.first();
- -
- if (!p_72955_1_ && nextticklistentry.scheduledTime > this.worldInfo.getWorldTotalTime())
+ Chunk chunk = getChunkIfLoaded(nextticklistentry.xCoord >> 4, nextticklistentry.zCoord >> 4); + Chunk chunk = getChunkIfLoaded(nextticklistentry.xCoord >> 4, nextticklistentry.zCoord >> 4);
+ if (!p_72955_1_ && (nextticklistentry.scheduledTime > this.worldInfo.getWorldTotalTime() || chunk == null)) if (!p_72955_1_ && nextticklistentry.scheduledTime > this.worldInfo.getWorldTotalTime())
{ {
break; break;
} @@ -523,6 +714,7 @@
this.pendingTickListEntriesTreeSet.remove(nextticklistentry); this.pendingTickListEntriesTreeSet.remove(nextticklistentry);
this.pendingTickListEntriesHashSet.remove(nextticklistentry); this.pendingTickListEntriesHashSet.remove(nextticklistentry);
+ chunk.blockUpdates.remove(nextticklistentry); // KCauldron + if (chunk != null) chunk.blockUpdates.remove(nextticklistentry); // KCauldron
this.pendingTickListEntriesThisTick.add(nextticklistentry); this.pendingTickListEntriesThisTick.add(nextticklistentry);
} }