61 lines
3.2 KiB
Diff
61 lines
3.2 KiB
Diff
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||
|
|
From: Spottedleaf <spottedleaf@spottedleaf.dev>
|
||
|
|
Date: Mon, 27 Apr 2020 02:48:06 -0700
|
||
|
|
Subject: [PATCH] Reduce MutableInt allocations from light engine
|
||
|
|
|
||
|
|
|
||
|
|
diff --git a/src/main/java/net/minecraft/server/LightEngineBlock.java b/src/main/java/net/minecraft/server/LightEngineBlock.java
|
||
|
|
index 93a972605c26aa757b9c915876f847da04fcb496..c4ba30bd56e2ead6015c0109f8e889388afeb7f2 100644
|
||
|
|
--- a/src/main/java/net/minecraft/server/LightEngineBlock.java
|
||
|
|
+++ b/src/main/java/net/minecraft/server/LightEngineBlock.java
|
||
|
|
@@ -37,7 +37,10 @@ public final class LightEngineBlock extends LightEngineLayer<LightEngineStorageB
|
||
|
|
if (enumdirection == null) {
|
||
|
|
return 15;
|
||
|
|
} else {
|
||
|
|
- MutableInt mutableint = new MutableInt();
|
||
|
|
+ // Paper start - reduce mutableint allocations
|
||
|
|
+ MutableInt mutableint = com.destroystokyo.paper.util.pooled.PooledObjects.POOLED_MUTABLE_INTEGERS.acquire();
|
||
|
|
+ try {
|
||
|
|
+ // Paper end - reduce mutableint allocations
|
||
|
|
IBlockData iblockdata = this.a(j, mutableint);
|
||
|
|
|
||
|
|
if (mutableint.getValue() >= 15) {
|
||
|
|
@@ -49,6 +52,10 @@ public final class LightEngineBlock extends LightEngineLayer<LightEngineStorageB
|
||
|
|
|
||
|
|
return VoxelShapes.b(voxelshape, voxelshape1) ? 15 : k + Math.max(1, mutableint.getValue());
|
||
|
|
}
|
||
|
|
+ } finally { // Paper start - reduce mutableint allocations
|
||
|
|
+ com.destroystokyo.paper.util.pooled.PooledObjects.POOLED_MUTABLE_INTEGERS.release(mutableint);
|
||
|
|
+ }
|
||
|
|
+ // Paper end - reduce mutableint allocations
|
||
|
|
}
|
||
|
|
}
|
||
|
|
}
|
||
|
|
diff --git a/src/main/java/net/minecraft/server/LightEngineSky.java b/src/main/java/net/minecraft/server/LightEngineSky.java
|
||
|
|
index 2301a982e17ab9568e3da9ca84c4a024c7c1b214..0b4f4604f4ea444017c021768574646a8d11ba26 100644
|
||
|
|
--- a/src/main/java/net/minecraft/server/LightEngineSky.java
|
||
|
|
+++ b/src/main/java/net/minecraft/server/LightEngineSky.java
|
||
|
|
@@ -27,7 +27,10 @@ public final class LightEngineSky extends LightEngineLayer<LightEngineStorageSky
|
||
|
|
if (k >= 15) {
|
||
|
|
return k;
|
||
|
|
} else {
|
||
|
|
- MutableInt mutableint = new MutableInt();
|
||
|
|
+ // Paper start - reduce mutableint allocations
|
||
|
|
+ MutableInt mutableint = com.destroystokyo.paper.util.pooled.PooledObjects.POOLED_MUTABLE_INTEGERS.acquire();
|
||
|
|
+ try {
|
||
|
|
+ // Paper end - reduce mutableint allocations
|
||
|
|
IBlockData iblockdata = this.a(j, mutableint);
|
||
|
|
|
||
|
|
if (mutableint.getValue() >= 15) {
|
||
|
|
@@ -85,6 +88,10 @@ public final class LightEngineSky extends LightEngineLayer<LightEngineStorageSky
|
||
|
|
|
||
|
|
return flag1 && k == 0 && mutableint.getValue() == 0 ? 0 : k + Math.max(1, mutableint.getValue());
|
||
|
|
}
|
||
|
|
+ } finally { // Paper start - reduce mutableint allocations
|
||
|
|
+ com.destroystokyo.paper.util.pooled.PooledObjects.POOLED_MUTABLE_INTEGERS.release(mutableint);
|
||
|
|
+ }
|
||
|
|
+ // Paper end - reduce mutableint allocations
|
||
|
|
}
|
||
|
|
}
|
||
|
|
}
|