Upstream/Paper
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2024-12-29 12:27:59 +01:00
Code Issues Projects Releases Wiki Activity

Don't create region files when checking if a chunk exists

Browse Source
This commit is contained in:
Aikar 2015-11-15 19:44:28 -06:00
parent 929a5b40ed
commit 68c983d7cd
1 changed files with 48 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
Spigot-Server-Patches/Don-t-create-Region-File-s-when-checking-if-chunk-ex.patch Normal file
View File

@ -0,0 +1,48 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Tue, 3 Nov 2015 21:05:41 -0500
Subject: [PATCH] Don't create Region File's when checking if chunk exists
Plugins like Dynap can end up creating tons of emtpy Region Files
when using chunkExists.
diff --git a/src/main/java/net/minecraft/server/ChunkRegionLoader.java b/src/main/java/net/minecraft/server/ChunkRegionLoader.java
index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
--- a/src/main/java/net/minecraft/server/ChunkRegionLoader.java
+++ b/src/main/java/net/minecraft/server/ChunkRegionLoader.java
@@ -0,0 +0,0 @@ public class ChunkRegionLoader implements IChunkLoader, IAsyncChunkSaver {
}
}
- return RegionFileCache.a(this.d, i, j).chunkExists(i & 31, j & 31);
+ final RegionFile region = RegionFileCache.a(this.d, i, j, false); // PaperSpigot
+ return region != null && region.chunkExists(i & 31, j & 31); // PaperSpigot
}
// CraftBukkit end
diff --git a/src/main/java/net/minecraft/server/RegionFileCache.java b/src/main/java/net/minecraft/server/RegionFileCache.java
index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
--- a/src/main/java/net/minecraft/server/RegionFileCache.java
+++ b/src/main/java/net/minecraft/server/RegionFileCache.java
@@ -0,0 +0,0 @@ public class RegionFileCache {
public static final Map<File, RegionFile> a = Maps.newHashMap(); // Spigot - private -> public
+ // PaperSpigot start
public static synchronized RegionFile a(File file, int i, int j) {
+ return a(file, i, j, true);
+ }
+ public static synchronized RegionFile a(File file, int i, int j, boolean create) {
+ // PaperSpigot end
File file1 = new File(file, "region");
File file2 = new File(file1, "r." + (i >> 5) + "." + (j >> 5) + ".mca");
RegionFile regionfile = (RegionFile) RegionFileCache.a.get(file2);
@@ -0,0 +0,0 @@ public class RegionFileCache {
if (regionfile != null) {
return regionfile;
} else {
+ if (!create && !file2.exists()) { return null; } // PaperSpigot
if (!file1.exists()) {
file1.mkdirs();
}
--