1 files changed, 78 insertions, 0 deletions
diff --git a/patches/server/0802-Improve-inlining-for-some-hot-BlockBehavior-and-Flui.patch b/patches/server/0802-Improve-inlining-for-some-hot-BlockBehavior-and-Flui.patch
new file mode 100644
index 0000000000..2f86713e06
--- /dev/null
+++ b/patches/server/0802-Improve-inlining-for-some-hot-BlockBehavior-and-Flui.patch
@@ -0,0 +1,78 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Spottedleaf <[email protected]>
+Date: Mon, 6 Jul 2020 20:46:50 -0700
+Subject: [PATCH] Improve inlining for some hot BlockBehavior and FluidState
+ methods
+
+
+diff --git a/src/main/java/net/minecraft/world/level/block/state/BlockBehaviour.java b/src/main/java/net/minecraft/world/level/block/state/BlockBehaviour.java
+index 24c2ec8e637373876a00bf292ac9318f79da7aef..c762a006b3f586b32209c20e85f6b8bf169dbd06 100644
+--- a/src/main/java/net/minecraft/world/level/block/state/BlockBehaviour.java
++++ b/src/main/java/net/minecraft/world/level/block/state/BlockBehaviour.java
+@@ -906,15 +906,15 @@ public abstract class BlockBehaviour implements FeatureElement {
+             return this.shapeExceedsCube; // Paper - moved into shape cache init
+         }
+ 
+-        public boolean useShapeForLightOcclusion() {
++        public final boolean useShapeForLightOcclusion() { // Paper - Perf: Final for inlining
+             return this.useShapeForLightOcclusion;
+         }
+ 
+-        public int getLightEmission() {
++        public final int getLightEmission() { // Paper - Perf: Final for inlining
+             return this.lightEmission;
+         }
+ 
+-        public boolean isAir() {
++        public final boolean isAir() { // Paper - Perf: Final for inlining
+             return this.isAir;
+         }
+ 
+@@ -998,7 +998,7 @@ public abstract class BlockBehaviour implements FeatureElement {
+             }
+         }
+ 
+-        public boolean canOcclude() {
++        public final boolean canOcclude() { // Paper - Perf: Final for inlining
+             return this.canOcclude;
+         }
+ 
+@@ -1214,11 +1214,11 @@ public abstract class BlockBehaviour implements FeatureElement {
+             return this.getBlock().builtInRegistryHolder().is(key);
+         }
+ 
+-        public FluidState getFluidState() {
++        public final FluidState getFluidState() { // Paper - Perf: Final for inlining
+             return this.fluidState;
+         }
+ 
+-        public boolean isRandomlyTicking() {
++        public final boolean isRandomlyTicking() { // Paper - Perf: Final for inlining
+             return this.isRandomlyTicking;
+         }
+ 
+diff --git a/src/main/java/net/minecraft/world/level/material/FluidState.java b/src/main/java/net/minecraft/world/level/material/FluidState.java
+index 42370e5e6628ebf8216c01521af859706b08834b..14bb12d2a0066e8b020f2e0e670a7a5c74633623 100644
+--- a/src/main/java/net/minecraft/world/level/material/FluidState.java
++++ b/src/main/java/net/minecraft/world/level/material/FluidState.java
+@@ -25,9 +25,11 @@ public final class FluidState extends StateHolder<Fluid, FluidState> {
+     public static final Codec<FluidState> CODEC = codec(BuiltInRegistries.FLUID.byNameCodec(), Fluid::defaultFluidState).stable();
+     public static final int AMOUNT_MAX = 9;
+     public static final int AMOUNT_FULL = 8;
++    protected final boolean isEmpty; // Paper - Perf: moved from isEmpty()
+ 
+     public FluidState(Fluid fluid, Reference2ObjectArrayMap<Property<?>, Comparable<?>> propertyMap, MapCodec<FluidState> codec) {
+         super(fluid, propertyMap, codec);
++        this.isEmpty = fluid.isEmpty(); // Paper - Perf: moved from isEmpty()
+     }
+ 
+     public Fluid getType() {
+@@ -43,7 +45,7 @@ public final class FluidState extends StateHolder<Fluid, FluidState> {
+     }
+ 
+     public boolean isEmpty() {
+-        return this.getType().isEmpty();
++        return this.isEmpty; // Paper - Perf: moved into constructor
+     }
+ 
+     public float getHeight(BlockGetter world, BlockPos pos) {