add back portal permission bypass patch

patches/server/0168-Add-portal-permission-bypass.patch

@@ -5,10 +5,10 @@ Subject: [PATCH] Add portal permission bypass
 
 
 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 ea3252a70c68f3c228417d8ed6d19d5669abb5fb..458c14d4f298137ef1a333368644568a2c8a0b09 100644
+index 68f414c421458a38e5db8225524c1bf87c2627f3..2fe3af832a228b1352b9b85dec06115009ef658f 100644
 --- a/src/main/java/net/minecraft/world/entity/player/Player.java
 +++ b/src/main/java/net/minecraft/world/entity/player/Player.java
-@@ -197,6 +197,7 @@ public abstract class Player extends LivingEntity {
+@@ -198,6 +198,7 @@ public abstract class Player extends LivingEntity {
      public net.kyori.adventure.util.TriState flyingFallDamage = net.kyori.adventure.util.TriState.NOT_SET; // Paper - flying fall damage
      public int sixRowEnderchestSlotCount = -1; // Purpur
      public int burpDelay = 0; // Purpur
@@ -16,15 +16,19 @@ index ea3252a70c68f3c228417d8ed6d19d5669abb5fb..458c14d4f298137ef1a333368644568a
  
      // CraftBukkit start
      public boolean fauxSleeping;
-@@ -488,7 +489,7 @@ public abstract class Player extends LivingEntity {
- 
-     @Override
-     public int getPortalWaitTime() {
--        return Math.max(1, this.level().getGameRules().getInt(this.abilities.invulnerable ? GameRules.RULE_PLAYERS_NETHER_PORTAL_CREATIVE_DELAY : GameRules.RULE_PLAYERS_NETHER_PORTAL_DEFAULT_DELAY));
-+        return Math.max(1, canPortalInstant ? 1 : this.level().getGameRules().getInt(this.abilities.invulnerable ? GameRules.RULE_PLAYERS_NETHER_PORTAL_CREATIVE_DELAY : GameRules.RULE_PLAYERS_NETHER_PORTAL_DEFAULT_DELAY));
-     }
- 
+diff --git a/src/main/java/net/minecraft/world/level/block/NetherPortalBlock.java b/src/main/java/net/minecraft/world/level/block/NetherPortalBlock.java
+index 259f7e162968714e2959b199c7b1ab847dd624ef..901674b1d2e616beec4782258ffb923818513db6 100644
+--- a/src/main/java/net/minecraft/world/level/block/NetherPortalBlock.java
++++ b/src/main/java/net/minecraft/world/level/block/NetherPortalBlock.java
+@@ -121,7 +121,7 @@ public class NetherPortalBlock extends Block implements Portal {
      @Override
+     public int getPortalTransitionTime(ServerLevel world, Entity entity) {
+         if (entity instanceof Player entityhuman) {
+-            return Math.max(1, world.getGameRules().getInt(entityhuman.getAbilities().invulnerable ? GameRules.RULE_PLAYERS_NETHER_PORTAL_CREATIVE_DELAY : GameRules.RULE_PLAYERS_NETHER_PORTAL_DEFAULT_DELAY));
++            return Math.max(1, entityhuman.canPortalInstant ? 1 : world.getGameRules().getInt(entityhuman.getAbilities().invulnerable ? GameRules.RULE_PLAYERS_NETHER_PORTAL_CREATIVE_DELAY : GameRules.RULE_PLAYERS_NETHER_PORTAL_DEFAULT_DELAY)); // Purpur
+         } else {
+             return 0;
+         }
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java
 index 41f3cdec7deabf34358b8087df77169f85a5b919..90265b6f2acd43713b61e277799dd31311b6b7e2 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java

patches/server/0181-Player-ridable-in-water-option.patch

@@ -5,10 +5,10 @@ Subject: [PATCH] Player ridable in water option
 
 
 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 68f414c421458a38e5db8225524c1bf87c2627f3..c610479c5c8d3e0aa5d70106eab8d8b1ccc80c7f 100644
+index 2fe3af832a228b1352b9b85dec06115009ef658f..cb6f161d32fe9642e9e9b1efc47d88612041ea15 100644
 --- a/src/main/java/net/minecraft/world/entity/player/Player.java
 +++ b/src/main/java/net/minecraft/world/entity/player/Player.java
-@@ -2087,6 +2087,13 @@ public abstract class Player extends LivingEntity {
+@@ -2088,6 +2088,13 @@ public abstract class Player extends LivingEntity {
          return slot != EquipmentSlot.BODY;
      }
  

patches/server/0221-Configurable-player-pickup-exp-delay.patch

@@ -22,10 +22,10 @@ index 6598a737db11fb0c7e7a95b9bbfaabd75895cbdd..ad69ef7fb8e68027c6f41618ee258565
                  int i = this.repairPlayerItems(entityplayer, this.value);
  
 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 c610479c5c8d3e0aa5d70106eab8d8b1ccc80c7f..d51e062ca2c432cf2976d5b2e03dcdcf8c40e348 100644
+index cb6f161d32fe9642e9e9b1efc47d88612041ea15..92df67d9e1d32c8a7aaeaaa46c7641af600edc52 100644
 --- a/src/main/java/net/minecraft/world/entity/player/Player.java
 +++ b/src/main/java/net/minecraft/world/entity/player/Player.java
-@@ -635,7 +635,7 @@ public abstract class Player extends LivingEntity {
+@@ -636,7 +636,7 @@ public abstract class Player extends LivingEntity {
              while (iterator.hasNext()) {
                  Entity entity = (Entity) iterator.next();