Remove stacktrace on exception from reading server.properties (#9296)

1 files changed, 0 insertions, 79 deletions

diff --git a/patches/server/0915-Improve-inlining-for-some-hot-BlockBehavior-and-Flui.patch b/patches/server/0915-Improve-inlining-for-some-hot-BlockBehavior-and-Flui.patch
deleted file mode 100644
index f4f36a8f11..0000000000
--- a/patches/server/0915-Improve-inlining-for-some-hot-BlockBehavior-and-Flui.patch
+++ /dev/null
@@ -1,79 +0,0 @@
-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 27680befd64967ef3c2ae0f35c9e7bd68d474314..de4c1e4701236e7d5ec77339c51ad6a9d8288bb6 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
-@@ -963,15 +963,15 @@ public abstract class BlockBehaviour implements FeatureElement {
-             return this.shapeExceedsCube; // Paper - moved into shape cache init
-         }
- 
--        public boolean useShapeForLightOcclusion() {
-+        public final boolean useShapeForLightOcclusion() { // Paper
-             return this.useShapeForLightOcclusion;
-         }
- 
--        public int getLightEmission() {
-+        public final int getLightEmission() { // Paper
-             return this.lightEmission;
-         }
- 
--        public boolean isAir() {
-+        public final boolean isAir() { // Paper
-             return this.isAir;
-         }
- 
-@@ -1055,7 +1055,7 @@ public abstract class BlockBehaviour implements FeatureElement {
-             }
-         }
- 
--        public boolean canOcclude() {
-+        public final boolean canOcclude() { // Paper
-             return this.canOcclude;
-         }
- 
-@@ -1251,11 +1251,11 @@ public abstract class BlockBehaviour implements FeatureElement {
-             return this.getBlock() == block;
-         }
- 
--        public FluidState getFluidState() {
-+        public final FluidState getFluidState() { // Paper
-             return this.fluidState;
-         }
- 
--        public boolean isRandomlyTicking() {
-+        public final boolean isRandomlyTicking() { // Paper
-             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 ea2a04e5298832177fac93568656ac45784d5eb6..27f136815afc360387704fa1f2773e3816cccff6 100644
---- a/src/main/java/net/minecraft/world/level/material/FluidState.java
-+++ b/src/main/java/net/minecraft/world/level/material/FluidState.java
-@@ -26,8 +26,12 @@ public final class FluidState extends StateHolder<Fluid, FluidState> {
-     public static final int AMOUNT_MAX = 9;
-     public static final int AMOUNT_FULL = 8;
- 
-+    // Paper start
-+    protected final boolean isEmpty;
-+    // Paper end
-     public FluidState(Fluid fluid, ImmutableMap<Property<?>, Comparable<?>> propertiesMap, MapCodec<FluidState> codec) {
-         super(fluid, propertiesMap, codec);
-+        this.isEmpty = fluid.isEmpty(); // Paper - moved from isEmpty()
-     }
- 
-     public Fluid getType() {
-@@ -43,7 +47,7 @@ public final class FluidState extends StateHolder<Fluid, FluidState> {
-     }
- 
-     public boolean isEmpty() {
--        return this.getType().isEmpty();
-+        return this.isEmpty; // Paper - moved into constructor
-     }
- 
-     public float getHeight(BlockGetter world, BlockPos pos) {