Browse Source

Fix #19 & Disable Chunk Caching (no longer necessary)

master
Robotia 9 years ago
parent
commit
b314857ece
  1. 12
      patches/net/minecraft/world/WorldServer.java.patch
  2. 4
      patches/net/minecraft/world/gen/ChunkProviderServer.java.patch

12
patches/net/minecraft/world/WorldServer.java.patch

@ -30,7 +30,7 @@
import net.minecraft.world.storage.ISaveHandler; import net.minecraft.world.storage.ISaveHandler;
import net.minecraftforge.common.ChestGenHooks; import net.minecraftforge.common.ChestGenHooks;
import static net.minecraftforge.common.ChestGenHooks.BONUS_CHEST; import static net.minecraftforge.common.ChestGenHooks.BONUS_CHEST;
@@ -67,14 +73,29 @@ @@ -67,11 +73,26 @@
import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger; import org.apache.logging.log4j.Logger;
@ -57,11 +57,7 @@
+ public EntityTracker theEntityTracker; // CraftBukkit - private final -> public + public EntityTracker theEntityTracker; // CraftBukkit - private final -> public
private final PlayerManager thePlayerManager; private final PlayerManager thePlayerManager;
private Set pendingTickListEntriesHashSet; private Set pendingTickListEntriesHashSet;
- private TreeSet pendingTickListEntriesTreeSet; private TreeSet pendingTickListEntriesTreeSet;
+ private SortedSet pendingTickListEntriesTreeSet;
public ChunkProviderServer theChunkProviderServer;
public boolean levelSaving;
private boolean allPlayersSleeping;
@@ -92,9 +113,13 @@ @@ -92,9 +113,13 @@
protected Set<ChunkCoordIntPair> doneChunks = new HashSet<ChunkCoordIntPair>(); protected Set<ChunkCoordIntPair> doneChunks = new HashSet<ChunkCoordIntPair>();
public List<Teleporter> customTeleporters = new ArrayList<Teleporter>(); public List<Teleporter> customTeleporters = new ArrayList<Teleporter>();
@ -87,7 +83,7 @@
if (this.pendingTickListEntriesTreeSet == null) if (this.pendingTickListEntriesTreeSet == null)
{ {
- this.pendingTickListEntriesTreeSet = new TreeSet(); - this.pendingTickListEntriesTreeSet = new TreeSet();
+ this.pendingTickListEntriesTreeSet = Collections.synchronizedSortedSet(new TreeSet()); + this.pendingTickListEntriesTreeSet = (new TreeSet());
} }
this.worldTeleporter = new Teleporter(this); this.worldTeleporter = new Teleporter(this);
@ -123,7 +119,7 @@
+ +
+ if (this.pendingTickListEntriesTreeSet == null) + if (this.pendingTickListEntriesTreeSet == null)
+ { + {
+ this.pendingTickListEntriesTreeSet = Collections.synchronizedSortedSet(new TreeSet()); + this.pendingTickListEntriesTreeSet = (new TreeSet());
+ } + }
+ +
+ this.worldTeleporter = new org.bukkit.craftbukkit.CraftTravelAgent(this); // CraftBukkit + this.worldTeleporter = new org.bukkit.craftbukkit.CraftTravelAgent(this); // CraftBukkit

4
patches/net/minecraft/world/gen/ChunkProviderServer.java.patch

@ -170,7 +170,7 @@
+ chunk = chunk_get(x,z); + chunk = chunk_get(x,z);
+ if(chunk != null) + if(chunk != null)
+ { + {
+ cachet_put(chunk); + //cachet_put(chunk);
+ } + }
} }
+ if(cachet_KC.size() > 100) + if(cachet_KC.size() > 100)
@ -317,7 +317,7 @@
+ chunk = (Chunk) chunk_get(p_73154_1_, p_73154_2_); + chunk = (Chunk) chunk_get(p_73154_1_, p_73154_2_);
+ if(chunk != null) + if(chunk != null)
+ { + {
+ cachet_put(chunk); + //cachet_put(chunk);
+ } + }
+ } + }
+ if(cachet_KC.size() > 100) + if(cachet_KC.size() > 100)

Loading…
Cancel
Save