1 files changed, 75 insertions, 0 deletions
diff --git a/Spigot-Server-Patches-Unmapped/0245-Improve-BlockPosition-inlining.patch b/Spigot-Server-Patches-Unmapped/0245-Improve-BlockPosition-inlining.patch
new file mode 100644
index 0000000000..9d4fb270ac
--- /dev/null
+++ b/Spigot-Server-Patches-Unmapped/0245-Improve-BlockPosition-inlining.patch
@@ -0,0 +1,75 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Techcable <[email protected]>
+Date: Wed, 30 Nov 2016 20:56:58 -0600
+Subject: [PATCH] Improve BlockPosition inlining
+
+Normally the JVM can inline virtual getters by having two sets of code, one is the 'optimized' code and the other is the 'deoptimized' code.
+If a single type is used 99% of the time, then its worth it to inline, and to revert to 'deoptimized' the 1% of the time we encounter other types.
+But if two types are encountered commonly, then the JVM can't inline them both, and the call overhead remains.
+
+This scenario also occurs with BlockPos and MutableBlockPos.
+The variables in BlockPos are final, so MutableBlockPos can't modify them.
+MutableBlockPos fixes this by adding custom mutable variables, and overriding the getters to access them.
+
+This approach with utility methods that operate on MutableBlockPos and BlockPos.
+Specific examples are BlockPosition.up(), and World.isValidLocation().
+It makes these simple methods much slower than they need to be.
+
+This should result in an across the board speedup in anything that accesses blocks or does logic with positions.
+
+This is based upon conclusions drawn from inspecting the assenmbly generated bythe JIT compiler on my microbenchmarks.
+They had 'callq' (invoke) instead of 'mov' (get from memory) instructions.
+
+diff --git a/src/main/java/net/minecraft/core/BaseBlockPosition.java b/src/main/java/net/minecraft/core/BaseBlockPosition.java
+index 4b56683336fdab06804efdc8ca1f7c130b77291f..a44bcdb053877a6281e566ffe03ef72ffd50ca08 100644
+--- a/src/main/java/net/minecraft/core/BaseBlockPosition.java
++++ b/src/main/java/net/minecraft/core/BaseBlockPosition.java
+@@ -41,7 +41,7 @@ public class BaseBlockPosition implements Comparable<BaseBlockPosition> {
+         this(MathHelper.floor(d0), MathHelper.floor(d1), MathHelper.floor(d2));
+     }
+ 
+-    public boolean equals(Object object) {
++    public final boolean equals(Object object) { // Paper
+         if (this == object) {
+             return true;
+         } else if (!(object instanceof BaseBlockPosition)) {
+@@ -53,7 +53,7 @@ public class BaseBlockPosition implements Comparable<BaseBlockPosition> {
+         }
+     }
+ 
+-    public int hashCode() {
++    public final int hashCode() { // Paper
+         return (this.getY() + this.getZ() * 31) * 31 + this.getX();
+     }
+ 
+@@ -61,15 +61,15 @@ public class BaseBlockPosition implements Comparable<BaseBlockPosition> {
+         return this.getY() == baseblockposition.getY() ? (this.getZ() == baseblockposition.getZ() ? this.getX() - baseblockposition.getX() : this.getZ() - baseblockposition.getZ()) : this.getY() - baseblockposition.getY();
+     }
+ 
+-    public int getX() {
++    public final int getX() { // Paper
+         return this.a;
+     }
+ 
+-    public int getY() {
++    public final int getY() { // Paper
+         return this.b;
+     }
+ 
+-    public int getZ() {
++    public final int getZ() { // Paper
+         return this.e;
+     }
+ 
+diff --git a/src/main/java/net/minecraft/core/BlockPosition.java b/src/main/java/net/minecraft/core/BlockPosition.java
+index 9fb6db18c5c1f39b5a564c0f5f70498825defa97..370b2c4460d6b52b5ef7da89f5ebf7ef50deb582 100644
+--- a/src/main/java/net/minecraft/core/BlockPosition.java
++++ b/src/main/java/net/minecraft/core/BlockPosition.java
+@@ -88,6 +88,7 @@ public class BlockPosition extends BaseBlockPosition {
+         return a(this.getX(), this.getY(), this.getZ());
+     }
+ 
++    public static long asLong(int x, int y, int z) { return a(x, y, z); } // Paper - OBFHELPER
+     public static long a(int i, int j, int k) {
+         long l = 0L;
+