From 06b8984846553d5e19f8efdab463cb4c2b63cf8a Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <blake.galbreath@gmail.com>
Date: Thu, 1 Jul 2021 13:17:46 -0500
Subject: [PATCH] Dont spam portal instant permission checks

---
 ...permission-bypass-for-portal-waiting.patch | 26 ++++++++++++++++---
 1 file changed, 23 insertions(+), 3 deletions(-)

diff --git a/patches/server/0218-Add-permission-bypass-for-portal-waiting.patch b/patches/server/0218-Add-permission-bypass-for-portal-waiting.patch
index 5ade07044..130ec849d 100644
--- a/patches/server/0218-Add-permission-bypass-for-portal-waiting.patch
+++ b/patches/server/0218-Add-permission-bypass-for-portal-waiting.patch
@@ -5,15 +5,35 @@ Subject: [PATCH] Add permission bypass for portal waiting
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/player/Player.java b/src/main/java/net/minecraft/world/entity/player/Player.java
-index 34e6be36d1304e072bd742a61105757f8e6b0a62..810e02b890f053a75b6cdc9afb1f3d9acd5e6736 100644
+index 34e6be36d1304e072bd742a61105757f8e6b0a62..4f256b1904b760d25d4a66fb27f2c930f9d2a285 100644
 --- a/src/main/java/net/minecraft/world/entity/player/Player.java
 +++ b/src/main/java/net/minecraft/world/entity/player/Player.java
-@@ -465,7 +465,7 @@ public abstract class Player extends LivingEntity {
+@@ -184,6 +184,7 @@ public abstract class Player extends LivingEntity {
+     // Paper end
+     public boolean isCritical = false; // Purpur
+     public boolean flyingFallDamage = false; // Purpur
++    public boolean canPortalInstant = false; // Purpur
+ 
+     // CraftBukkit start
+     public boolean fauxSleeping;
+@@ -465,7 +466,7 @@ public abstract class Player extends LivingEntity {
  
      @Override
      public int getPortalWaitTime() {
 -        return this.abilities.invulnerable ? 1 : 80;
-+        return this.abilities.invulnerable || getBukkitEntity().hasPermission("purpur.portal.instant") ? 1 : 80; // Purpur
++        return this.abilities.invulnerable || canPortalInstant ? 1 : 80; // Purpur
+     }
+ 
+     @Override
+diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java
+index 3ab8bd503a599a11c0d50017826cebf6765197f3..453f74ff74d63152e5bcc0d22301d0c55fded682 100644
+--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java
++++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java
+@@ -245,6 +245,7 @@ public class CraftHumanEntity extends CraftLivingEntity implements HumanEntity {
+     @Override
+     public void recalculatePermissions() {
+         this.perm.recalculatePermissions();
++        getHandle().canPortalInstant = hasPermission("purpur.portal.instant"); // Purpur
      }
  
      @Override