mirror of
https://github.com/PaperMC/Paper.git
synced 2024-11-05 10:20:53 +01:00
835bc39b03
Updated Upstream (Bukkit/CraftBukkit/Spigot) Bukkit Changes: 2dcc44dc SPIGOT-4307: Fix hacky API for banners on shields e0fc6572 SPIGOT-4309: Add "forced" display of particles efeeab2f Add index to README.md for easier navigation f502bc6f Update to Minecraft 1.13.1 CraftBukkit Changes:d0bb0a1d
Fix some tests randomly failing997d378d
Fix client stall in specific teleportation scenariosb3dc2366
SPIGOT-4307: Fix hacky API for banners on shields2a271162
SPIGOT-4301: Fix more invalid enchants5d0d83bb
SPIGOT-4309: Add "forced" display of particlesa6772578
Add additional tests for CraftBlockDatace1af0c3
Update to Minecraft 1.13.1 Spigot Changes: 2440e189 Rebuild patches 4ecffced Update to Minecraft 1.13.1
33 lines
1.3 KiB
Diff
33 lines
1.3 KiB
Diff
From 9445d84de84ff1a9bd3edf221db6995c8fb1ab74 Mon Sep 17 00:00:00 2001
|
|
From: Aikar <aikar@aikar.co>
|
|
Date: Mon, 26 Sep 2016 01:51:30 -0400
|
|
Subject: [PATCH] Disable Vanilla Chunk GC
|
|
|
|
Bukkit has its own system for this.
|
|
|
|
diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
|
|
index 59b5a04581..e58b21ae43 100644
|
|
--- a/src/main/java/net/minecraft/server/WorldServer.java
|
|
+++ b/src/main/java/net/minecraft/server/WorldServer.java
|
|
@@ -889,6 +889,7 @@ public class WorldServer extends World implements IAsyncTaskHandler {
|
|
chunkproviderserver.a(flag);
|
|
timings.worldSaveChunks.stopTiming(); // Paper
|
|
// CraftBukkit - ArrayList -> Collection
|
|
+ /* //Paper start - disable vanilla chunk GC
|
|
java.util.Collection arraylist = chunkproviderserver.a();
|
|
Iterator iterator = arraylist.iterator();
|
|
|
|
@@ -898,7 +899,8 @@ public class WorldServer extends World implements IAsyncTaskHandler {
|
|
if (chunk != null && !this.manager.a(chunk.locX, chunk.locZ)) {
|
|
chunkproviderserver.unload(chunk);
|
|
}
|
|
- }
|
|
+ }*/
|
|
+ // Paper end
|
|
timings.worldSave.stopTiming(); // Paper
|
|
}
|
|
}
|
|
--
|
|
2.18.0
|
|
|