SteamWar/Paper
9
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix NPE in recheckGaps when using async lighting

Browse Source
This commit is contained in:
Byteflux
2015-08-06 21:44:03 -07:00
parent f2f04fbb77
commit d4bd87a7ec
2 changed files with 2 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Spigot-Server-Patches/Configurable-async-light-updates.patch
View File

@@ -108,7 +108,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
public static boolean haveWeSilencedAPhysicsCrash; public static boolean haveWeSilencedAPhysicsCrash;
public static String blockLocation; public static String blockLocation;
private int tileTickPosition; private int tileTickPosition;
+ public ExecutorService lightingExecutor; // PaperSpigot - Asynchronous lighting updates + public ExecutorService lightingExecutor = Executors.newSingleThreadExecutor(new ThreadFactoryBuilder().setNameFormat("PaperSpigot - Lighting Thread").build()); // PaperSpigot - Asynchronous lighting updates
public static long chunkToKey(int x, int z) public static long chunkToKey(int x, int z)
{ {
@@ -182,10 +182,6 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
+ return this.c(enumskyblock, position, chunk, null); + return this.c(enumskyblock, position, chunk, null);
+ } + }
+ +
+ if (lightingExecutor == null) {
+ lightingExecutor = Executors.newSingleThreadExecutor(new ThreadFactoryBuilder().setNameFormat("PaperSpigot - Lighting Thread").build());
+ }
+
+ chunk.pendingLightUpdates.incrementAndGet(); + chunk.pendingLightUpdates.incrementAndGet();
+ chunk.lightUpdateTime = chunk.world.getTime(); + chunk.lightUpdateTime = chunk.world.getTime();
+ +

2
Spigot-Server-Patches/Optimize-explosions.patch
View File

@@ -128,7 +128,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
@@ -0,0 +0,0 @@ public abstract class World implements IBlockAccess { @@ -0,0 +0,0 @@ public abstract class World implements IBlockAccess {
public static String blockLocation; public static String blockLocation;
private int tileTickPosition; private int tileTickPosition;
public ExecutorService lightingExecutor; // PaperSpigot - Asynchronous lighting updates public ExecutorService lightingExecutor = Executors.newSingleThreadExecutor(new ThreadFactoryBuilder().setNameFormat("PaperSpigot - Lighting Thread").build()); // PaperSpigot - Asynchronous lighting updates
+ public final Map<Explosion.CacheKey, Float> explosionDensityCache = new HashMap<Explosion.CacheKey, Float>(); // PaperSpigot - Optimize explosions + public final Map<Explosion.CacheKey, Float> explosionDensityCache = new HashMap<Explosion.CacheKey, Float>(); // PaperSpigot - Optimize explosions
public static long chunkToKey(int x, int z) public static long chunkToKey(int x, int z)