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

Fix Optional null issue - Fixes #3155

Browse Source 
Also check class loader cache before locking to speed up cached hits to avoid the lock

wasn't gonna make a unique build just for that but can lump it in here.
This commit is contained in:
Aikar
2020-04-16 03:57:02 -04:00
parent e7f799903e
commit 902942d9e4
2 changed files with 10 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Spigot-Server-Patches/Reduce-Either-Optional-allocation.patch
View File

@@ -7,7 +7,7 @@ In order to get chunk values, we shouldn't need to create
an optional each time.
diff --git a/src/main/java/com/mojang/datafixers/util/Either.java b/src/main/java/com/mojang/datafixers/util/Either.java
index a90adac7b..efae74b71 100644
index a90adac7b..4bb621d57 100644
--- a/src/main/java/com/mojang/datafixers/util/Either.java
+++ b/src/main/java/com/mojang/datafixers/util/Either.java
@@ -0,0 +0,0 @@ public abstract class Either<L, R> implements App<Either.Mu<R>, L> {
@@ -19,7 +19,7 @@ index a90adac7b..efae74b71 100644
public Left(final L value) {
- this.value = value;
+ this.value = value; this.valueOptional = Optional.of(value); // Paper - reduce the optional allocation...
+ this.value = value; this.valueOptional = value != null ? Optional.of(value) : Optional.empty(); // Paper - reduce the optional allocation...
}
@Override
@@ -41,7 +41,7 @@ index a90adac7b..efae74b71 100644
public Right(final R value) {
- this.value = value;
+ this.value = value; this.valueOptional = Optional.of(value); // Paper - reduce the optional allocation...
+ this.value = value; this.valueOptional = value != null ? Optional.of(value) : Optional.empty(); // Paper - reduce the optional allocation...
}
@Override