From 012a401d1e81e958b4aac2423048555bae645ef1 Mon Sep 17 00:00:00 2001 From: Leijurv <leijurv@gmail.com> Date: Thu, 25 Mar 2021 18:52:46 -1000 Subject: [PATCH] Optimize short circuit evaluation of sign check (#5348) --- .../Allow-using-signs-inside-spawn-protection.patch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Spigot-Server-Patches/Allow-using-signs-inside-spawn-protection.patch b/Spigot-Server-Patches/Allow-using-signs-inside-spawn-protection.patch index 91e5ab0b69..e7f3c9d812 100644 --- a/Spigot-Server-Patches/Allow-using-signs-inside-spawn-protection.patch +++ b/Spigot-Server-Patches/Allow-using-signs-inside-spawn-protection.patch @@ -35,7 +35,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 this.player.resetIdleTimer(); if (blockposition.getY() < this.minecraftServer.getMaxBuildHeight()) { - if (this.teleportPos == null && this.player.h((double) blockposition.getX() + 0.5D, (double) blockposition.getY() + 0.5D, (double) blockposition.getZ() + 0.5D) < 64.0D && worldserver.a((EntityHuman) this.player, blockposition)) { -+ if (this.teleportPos == null && this.player.h((double) blockposition.getX() + 0.5D, (double) blockposition.getY() + 0.5D, (double) blockposition.getZ() + 0.5D) < 64.0D && (worldserver.a((EntityHuman) this.player, blockposition) || (worldserver.getType(blockposition).getBlock() instanceof BlockSign && worldserver.paperConfig.allowUsingSignsInsideSpawnProtection))) { // Paper ++ if (this.teleportPos == null && this.player.h((double) blockposition.getX() + 0.5D, (double) blockposition.getY() + 0.5D, (double) blockposition.getZ() + 0.5D) < 64.0D && (worldserver.a((EntityHuman) this.player, blockposition) || (worldserver.paperConfig.allowUsingSignsInsideSpawnProtection && worldserver.getType(blockposition).getBlock() instanceof BlockSign))) { // Paper // CraftBukkit start - Check if we can actually do something over this large a distance // Paper - move check up this.player.clearActiveItem(); // SPIGOT-4706