Add Entities can use portals patch back (PurpurMC#1571)

Author: Krakenied

…ties-can-use-portals-configuration.patch …rver/0084-Entities-can-use-portals.patchpatches/dropped-server/0083-Entities-can-use-portals-configuration.patch renamed to patches/server/0084-Entities-can-use-portals.patch patches/dropped-server/0083-Entities-can-use-portals-configuration.patch renamed to patches/server/0084-Entities-can-use-portals.patch

@@ -1,44 +1,44 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <Blake.Galbreath@GMail.com>
 Date: Mon, 17 Aug 2020 19:32:05 -0500
-Subject: [PATCH] Entities can use portals configuration
+Subject: [PATCH] Entities can use portals
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index b3fe632b18e5dfa18d37ef23a5a62f3a0f9ccf42..e29f56c83e8ce237e9135fabcf2381130a1a790d 100644
+index 02e31827de699c6df409fbc3b88f7ded68236e20..51eebbee1c46062b35a2703713f2e1dfafcb0b26 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
-@@ -3225,7 +3225,7 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
-     public void handleInsidePortal(BlockPos pos) {
+@@ -3266,7 +3266,7 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
+     public void setAsInsidePortal(Portal portal, BlockPos pos) {
          if (this.isOnPortalCooldown()) {
              this.setPortalCooldown();
 -        } else {
-+        } else if (level().purpurConfig.entitiesCanUsePortals || this instanceof ServerPlayer) { // Purpur
-             if (!this.level().isClientSide && !pos.equals(this.portalEntrancePos)) {
-                 this.portalEntrancePos = pos.immutable();
-             }
-@@ -3919,7 +3919,7 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
-     }
++        } else if (this.level.purpurConfig.entitiesCanUsePortals || this instanceof ServerPlayer) { // Purpur - Entities can use portals
+             if (this.portalProcess != null && this.portalProcess.isSamePortal(portal)) {
+                 this.portalProcess.updateEntryPosition(pos.immutable());
+                 this.portalProcess.setAsInsidePortalThisTick(true);
+@@ -3889,7 +3889,7 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
+     // CraftBukkit end
 
-     public boolean canChangeDimensions() {
--        return !this.isPassenger() && !this.isVehicle() && isAlive() && valid; // Paper - Fix item duplication and teleport issues
-+        return !this.isPassenger() && !this.isVehicle() && isAlive() && valid && (level().purpurConfig.entitiesCanUsePortals || this instanceof ServerPlayer); // Paper - Fix item duplication and teleport issues // Purpur
+     public boolean canUsePortal(boolean allowVehicles) {
+-        return (allowVehicles || !this.isPassenger()) && this.isAlive();
++        return (allowVehicles || !this.isPassenger()) && this.isAlive() && (this.level.purpurConfig.entitiesCanUsePortals || this instanceof ServerPlayer); // Purpur - Entities can use portals
      }
 
-     public float getBlockExplosionResistance(Explosion explosion, BlockGetter world, BlockPos pos, BlockState blockState, FluidState fluidState, float max) {
+     public boolean canChangeDimensions(Level from, Level to) {
 diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-index 56f34c0a0f7bc94a90bb1db32f8e30a590a3b38c..1f25407aafba71762a482f0b1982302fed14387f 100644
+index b3a9e307d1bed0c53a42119fa74c3a0f1be12d36..9f00ee2e9882226973c6846211574809c18b52bc 100644
 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-@@ -98,6 +98,7 @@ public class PurpurWorldConfig {
+@@ -99,6 +99,7 @@ public class PurpurWorldConfig {
      public boolean useBetterMending = false;
      public boolean boatEjectPlayersOnLand = false;
      public boolean disableDropsOnCrammingDeath = false;
 +    public boolean entitiesCanUsePortals = true;
      public boolean milkCuresBadOmen = true;
      public double tridentLoyaltyVoidReturnHeight = 0.0D;
      public double voidDamageHeight = -64.0D;
-@@ -106,6 +107,7 @@ public class PurpurWorldConfig {
+@@ -107,6 +108,7 @@ public class PurpurWorldConfig {
          useBetterMending = getBoolean("gameplay-mechanics.use-better-mending", useBetterMending);
          boatEjectPlayersOnLand = getBoolean("gameplay-mechanics.boat.eject-players-on-land", boatEjectPlayersOnLand);
          disableDropsOnCrammingDeath = getBoolean("gameplay-mechanics.disable-drops-on-cramming-death", disableDropsOnCrammingDeath);

…omizable-wither-health-and-healing.patch …omizable-wither-health-and-healing.patchpatches/server/0084-Customizable-wither-health-and-healing.patch renamed to patches/server/0085-Customizable-wither-health-and-healing.patch patches/server/0084-Customizable-wither-health-and-healing.patch renamed to patches/server/0085-Customizable-wither-health-and-healing.patch

@@ -23,10 +23,10 @@ index 0e2e7f935deb674bfcbdf4f1ba7de7834ed1c61a..e3ee5d5eb80d689eb77731b3f26d0c31
 
              this.bossEvent.setProgress(this.getHealth() / this.getMaxHealth());
 diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-index b3a9e307d1bed0c53a42119fa74c3a0f1be12d36..36b2b377f3253e5013c307b82c6ed893d5b58ffd 100644
+index 9f00ee2e9882226973c6846211574809c18b52bc..0fbb32272453df331df54e8eda37da0b9b7af954 100644
 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-@@ -1861,6 +1861,8 @@ public class PurpurWorldConfig {
+@@ -1863,6 +1863,8 @@ public class PurpurWorldConfig {
      public double witherMaxY = 320D;
      public double witherMaxHealth = 300.0D;
      public double witherScale = 1.0D;
@@ -35,7 +35,7 @@ index b3a9e307d1bed0c53a42119fa74c3a0f1be12d36..36b2b377f3253e5013c307b82c6ed893
      private void witherSettings() {
          witherRidable = getBoolean("mobs.wither.ridable", witherRidable);
          witherRidableInWater = getBoolean("mobs.wither.ridable-in-water", witherRidableInWater);
-@@ -1877,6 +1879,8 @@ public class PurpurWorldConfig {
+@@ -1879,6 +1881,8 @@ public class PurpurWorldConfig {
          }
          witherMaxHealth = getDouble("mobs.wither.attributes.max_health", witherMaxHealth);
          witherScale = Mth.clamp(getDouble("mobs.wither.attributes.scale", witherScale), 0.0625D, 16.0D);

…ling-special-MobSpawners-per-world.patch …ling-special-MobSpawners-per-world.patchpatches/server/0085-Allow-toggling-special-MobSpawners-per-world.patch renamed to patches/server/0086-Allow-toggling-special-MobSpawners-per-world.patch patches/server/0085-Allow-toggling-special-MobSpawners-per-world.patch renamed to patches/server/0086-Allow-toggling-special-MobSpawners-per-world.patch

@@ -59,7 +59,7 @@ index c72b6ea5530e54fc373c701028e1c147cea34b59..96e9fce5f9084737d2fcf4deb8330573
              if (spawnplacementtype.isSpawnPositionOk(world, blockposition2, EntityType.WANDERING_TRADER)) {
                  blockposition1 = blockposition2;
 diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-index 36b2b377f3253e5013c307b82c6ed893d5b58ffd..e43e5facf44978994c8a515a20906dc8fbf8b9b8 100644
+index 0fbb32272453df331df54e8eda37da0b9b7af954..03aa9b6bc1095475c21a93544c14e5f5bfa1e141 100644
 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 @@ -70,6 +70,12 @@ public class PurpurWorldConfig {
@@ -75,7 +75,7 @@ index 36b2b377f3253e5013c307b82c6ed893d5b58ffd..e43e5facf44978994c8a515a20906dc8
      private double getDouble(String path, double def) {
          PurpurConfig.config.addDefault("world-settings.default." + path, def);
          return PurpurConfig.config.getDouble("world-settings." + worldName + "." + path, PurpurConfig.config.getDouble("world-settings.default." + path));
-@@ -234,6 +240,21 @@ public class PurpurWorldConfig {
+@@ -236,6 +242,21 @@ public class PurpurWorldConfig {
          }
      }
 

…/server/0086-Raid-cooldown-setting.patch …/server/0087-Raid-cooldown-setting.patchpatches/server/0086-Raid-cooldown-setting.patch renamed to patches/server/0087-Raid-cooldown-setting.patch patches/server/0086-Raid-cooldown-setting.patch renamed to patches/server/0087-Raid-cooldown-setting.patch

@@ -49,18 +49,18 @@ index 8c60f71270d909c10e6617eb64b8fdb42deb73e9..eedce2a3d67d875d5174ee125e267948
                      if (!raid.isStarted() && !this.raidMap.containsKey(raid.getId())) {
                          this.raidMap.put(raid.getId(), raid);
 diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-index e43e5facf44978994c8a515a20906dc8fbf8b9b8..092b8854470cb034205f2cf708186d559be5d609 100644
+index 03aa9b6bc1095475c21a93544c14e5f5bfa1e141..0549d17b69e869d9014040528e9163d56a316972 100644
 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-@@ -109,6 +109,7 @@ public class PurpurWorldConfig {
+@@ -110,6 +110,7 @@ public class PurpurWorldConfig {
      public double tridentLoyaltyVoidReturnHeight = 0.0D;
      public double voidDamageHeight = -64.0D;
      public double voidDamageDealt = 4.0D;
 +    public int raidCooldownSeconds = 0;
      private void miscGameplayMechanicsSettings() {
          useBetterMending = getBoolean("gameplay-mechanics.use-better-mending", useBetterMending);
          boatEjectPlayersOnLand = getBoolean("gameplay-mechanics.boat.eject-players-on-land", boatEjectPlayersOnLand);
-@@ -117,6 +118,7 @@ public class PurpurWorldConfig {
+@@ -119,6 +120,7 @@ public class PurpurWorldConfig {
          tridentLoyaltyVoidReturnHeight = getDouble("gameplay-mechanics.trident-loyalty-void-return-height", tridentLoyaltyVoidReturnHeight);
          voidDamageHeight = getDouble("gameplay-mechanics.void-damage-height", voidDamageHeight);
          voidDamageDealt = getDouble("gameplay-mechanics.void-damage-dealt", voidDamageDealt);

…config-options-per-projectile-type.patch …config-options-per-projectile-type.patchpatches/server/0087-Despawn-rate-config-options-per-projectile-type.patch renamed to patches/server/0088-Despawn-rate-config-options-per-projectile-type.patch patches/server/0087-Despawn-rate-config-options-per-projectile-type.patch renamed to patches/server/0088-Despawn-rate-config-options-per-projectile-type.patch

@@ -7,10 +7,10 @@ This patch's implementation has been removed in favor of Pufferfish's entity-tim
 The config remains for migration purposes.
 
 diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-index 092b8854470cb034205f2cf708186d559be5d609..6cda920dca61ce781ecfb4b49da31e7c297d3b39 100644
+index 0549d17b69e869d9014040528e9163d56a316972..f10a009ad72789015861fbc35d490f6c72dd036c 100644
 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-@@ -315,6 +315,40 @@ public class PurpurWorldConfig {
+@@ -317,6 +317,40 @@ public class PurpurWorldConfig {
          });
      }
 

…ble-zombie-aggressiveness-towards-.patch …ble-zombie-aggressiveness-towards-.patchpatches/server/0088-Add-option-to-disable-zombie-aggressiveness-towards-.patch renamed to patches/server/0089-Add-option-to-disable-zombie-aggressiveness-towards-.patch patches/server/0088-Add-option-to-disable-zombie-aggressiveness-towards-.patch renamed to patches/server/0089-Add-option-to-disable-zombie-aggressiveness-towards-.patch

@@ -70,18 +70,18 @@ index ada1f9f9bf8770c48ff25d562cf84cb04be17ca2..21e0028ad33f8de0211dd733d98a00af
          this.targetSelector.addGoal(5, new NearestAttackableTargetGoal<>(this, Turtle.class, 10, true, false, Turtle.BABY_ON_LAND_SELECTOR));
      }
 diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-index 6cda920dca61ce781ecfb4b49da31e7c297d3b39..e7b7ec38bd2be51a03dace23d0af90d72404d9e8 100644
+index f10a009ad72789015861fbc35d490f6c72dd036c..b7af904f30fdbb9a3f680d1d8244edf1e0061e25 100644
 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-@@ -2003,6 +2003,7 @@ public class PurpurWorldConfig {
+@@ -2005,6 +2005,7 @@ public class PurpurWorldConfig {
      public boolean zombieJockeyOnlyBaby = true;
      public double zombieJockeyChance = 0.05D;
      public boolean zombieJockeyTryExistingChickens = true;
 +    public boolean zombieAggressiveTowardsVillagerWhenLagging = true;
      private void zombieSettings() {
          zombieRidable = getBoolean("mobs.zombie.ridable", zombieRidable);
          zombieRidableInWater = getBoolean("mobs.zombie.ridable-in-water", zombieRidableInWater);
-@@ -2018,6 +2019,7 @@ public class PurpurWorldConfig {
+@@ -2020,6 +2021,7 @@ public class PurpurWorldConfig {
          zombieJockeyOnlyBaby = getBoolean("mobs.zombie.jockey.only-babies", zombieJockeyOnlyBaby);
          zombieJockeyChance = getDouble("mobs.zombie.jockey.chance", zombieJockeyChance);
          zombieJockeyTryExistingChickens = getBoolean("mobs.zombie.jockey.try-existing-chickens", zombieJockeyTryExistingChickens);

…to-recipe-s-ExactChoice-ingredient.patch …to-recipe-s-ExactChoice-ingredient.patchpatches/server/0089-Add-predicate-to-recipe-s-ExactChoice-ingredient.patch renamed to patches/server/0090-Add-predicate-to-recipe-s-ExactChoice-ingredient.patch patches/server/0089-Add-predicate-to-recipe-s-ExactChoice-ingredient.patch renamed to patches/server/0090-Add-predicate-to-recipe-s-ExactChoice-ingredient.patch

@@ -58,10 +58,10 @@ index 522dabcf6ec8b19902890718717fc890d430c750..ea80eca266500f93fa9c00962d078ec2
                  float g = Mth.cos(f) * 0.2F;
                  float h = -0.1F + this.squid.getRandom().nextFloat() * 0.2F;
 diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-index e7b7ec38bd2be51a03dace23d0af90d72404d9e8..a0e89374b94852352400d5089052433b6de0fd92 100644
+index b7af904f30fdbb9a3f680d1d8244edf1e0061e25..8ee07ea25cbc5d59b972116c09ec57f0a679aa93 100644
 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-@@ -969,11 +969,13 @@ public class PurpurWorldConfig {
+@@ -971,11 +971,13 @@ public class PurpurWorldConfig {
      public boolean glowSquidControllable = true;
      public double glowSquidMaxHealth = 10.0D;
      public double glowSquidScale = 1.0D;
@@ -75,15 +75,15 @@ index e7b7ec38bd2be51a03dace23d0af90d72404d9e8..a0e89374b94852352400d5089052433b
      }
 
      public boolean goatRidable = false;
-@@ -1660,6 +1662,7 @@ public class PurpurWorldConfig {
+@@ -1662,6 +1664,7 @@ public class PurpurWorldConfig {
      public double squidScale = 1.0D;
      public boolean squidImmuneToEAR = true;
      public double squidOffsetWaterCheck = 0.0D;
 +    public boolean squidsCanFly = false;
      private void squidSettings() {
          squidRidable = getBoolean("mobs.squid.ridable", squidRidable);
          squidControllable = getBoolean("mobs.squid.controllable", squidControllable);
-@@ -1672,6 +1675,7 @@ public class PurpurWorldConfig {
+@@ -1674,6 +1677,7 @@ public class PurpurWorldConfig {
          squidScale = Mth.clamp(getDouble("mobs.squid.attributes.scale", squidScale), 0.0625D, 16.0D);
          squidImmuneToEAR = getBoolean("mobs.squid.immune-to-EAR", squidImmuneToEAR);
          squidOffsetWaterCheck = getDouble("mobs.squid.water-offset-check", squidOffsetWaterCheck);

…es/server/0090-Flying-squids-Oh-my.patch …es/server/0091-Flying-squids-Oh-my.patchpatches/server/0090-Flying-squids-Oh-my.patch renamed to patches/server/0091-Flying-squids-Oh-my.patch patches/server/0090-Flying-squids-Oh-my.patch renamed to patches/server/0091-Flying-squids-Oh-my.patch

@@ -30,10 +30,10 @@ index 6eb5c0f23d9dc61e69ad5ad493c89602a9dcd4b5..4db2032178471860baddc6b669c9a4f8
          } else {
              user.startUsingItem(hand);
 diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-index a0e89374b94852352400d5089052433b6de0fd92..85e16939a1ac27037b1959e4fc1ec57324a7c11e 100644
+index 8ee07ea25cbc5d59b972116c09ec57f0a679aa93..22522af6a0b0894c798399456303d951ca884fe6 100644
 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-@@ -137,6 +137,11 @@ public class PurpurWorldConfig {
+@@ -139,6 +139,11 @@ public class PurpurWorldConfig {
          entityLifeSpan = getInt("gameplay-mechanics.entity-lifespan", entityLifeSpan);
      }
 

…/server/0091-Infinity-bow-settings.patch …/server/0092-Infinity-bow-settings.patchpatches/server/0091-Infinity-bow-settings.patch renamed to patches/server/0092-Infinity-bow-settings.patch patches/server/0091-Infinity-bow-settings.patch renamed to patches/server/0092-Infinity-bow-settings.patch

@@ -88,10 +88,10 @@ index 648aa9ec26ee2291a0caf2c61a3da4429566c343..ce5da7fc2d94a4b54e2a33de1e3ac629
      public void tickCustomSpawners(boolean spawnMonsters, boolean spawnAnimals) {
          Iterator iterator = this.customSpawners.iterator();
 diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-index 85e16939a1ac27037b1959e4fc1ec57324a7c11e..fde8c013bb398f924d8c6a7fbfabf276f0a96936 100644
+index 22522af6a0b0894c798399456303d951ca884fe6..34aafc5bac4e7876fdf50289748df5070126139e 100644
 --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
-@@ -121,6 +121,13 @@ public class PurpurWorldConfig {
+@@ -123,6 +123,13 @@ public class PurpurWorldConfig {
          raidCooldownSeconds = getInt("gameplay-mechanics.raid-cooldown-seconds", raidCooldownSeconds);
      }