Add back player spawned endermite API

patches/server/0130-Add-back-player-spawned-endermite-API.patch

@@ -1,80 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Encode42 <me@encode42.dev>
-Date: Tue, 9 Mar 2021 16:10:39 -0500
-Subject: [PATCH] Add back player spawned endermite API
-
-
-diff --git a/net/minecraft/world/entity/monster/Endermite.java b/net/minecraft/world/entity/monster/Endermite.java
-index fa4f25c7aece94a7468da1d7ed3cbd1abbce9640..e48ebd0424828624c980e0c3e09a0cb37685be5e 100644
---- a/net/minecraft/world/entity/monster/Endermite.java
-+++ b/net/minecraft/world/entity/monster/Endermite.java
-@@ -32,6 +32,7 @@ public class Endermite extends Monster {
- 
-     private static final int MAX_LIFE = 2400;
-     public int life;
-+    private boolean isPlayerSpawned; // Purpur - Add back player spawned endermite API
- 
-     public Endermite(EntityType<? extends Endermite> type, Level world) {
-         super(type, world);
-@@ -68,6 +69,15 @@ public class Endermite extends Monster {
-         return this.level().purpurConfig.endermiteTakeDamageFromWater;
-     }
-     // Purpur end - Toggle for water sensitive mob damage
-+    // Purpur start - Add back player spawned endermite API
-+    public boolean isPlayerSpawned() {
-+        return this.isPlayerSpawned;
-+    }
-+
-+    public void setPlayerSpawned(boolean playerSpawned) {
-+        this.isPlayerSpawned = playerSpawned;
-+    }
-+    // Purpur end - Add back player spawned endermite API
-     @Override
-     protected void registerGoals() {
-         this.goalSelector.addGoal(1, new FloatGoal(this));
-@@ -115,12 +125,14 @@ public class Endermite extends Monster {
-     public void readAdditionalSaveData(CompoundTag nbt) {
-         super.readAdditionalSaveData(nbt);
-         this.life = nbt.getInt("Lifetime");
-+        this.isPlayerSpawned = nbt.getBoolean("PlayerSpawned"); // Purpur - Add back player spawned endermite API
-     }
- 
-     @Override
-     public void addAdditionalSaveData(CompoundTag nbt) {
-         super.addAdditionalSaveData(nbt);
-         nbt.putInt("Lifetime", this.life);
-+        nbt.putBoolean("PlayerSpawned", this.isPlayerSpawned); // Purpur - Add back player spawned endermite API
-     }
- 
-     @Override
-diff --git a/net/minecraft/world/entity/projectile/ThrownEnderpearl.java b/net/minecraft/world/entity/projectile/ThrownEnderpearl.java
-index a044a5242ce1d1f6e34ecd5b4568553428d2f0b8..0720df603b4f89dd6aa346091b13033ad5d62907 100644
---- a/net/minecraft/world/entity/projectile/ThrownEnderpearl.java
-+++ b/net/minecraft/world/entity/projectile/ThrownEnderpearl.java
-@@ -156,6 +156,7 @@ public class ThrownEnderpearl extends ThrowableItemProjectile {
-                                 Endermite entityendermite = (Endermite) EntityType.ENDERMITE.create(worldserver, EntitySpawnReason.TRIGGERED);
- 
-                                 if (entityendermite != null) {
-+                                    entityendermite.setPlayerSpawned(true); // Purpur
-                                     entityendermite.moveTo(entity.getX(), entity.getY(), entity.getZ(), entity.getYRot(), entity.getXRot());
-                                     worldserver.addFreshEntity(entityendermite, CreatureSpawnEvent.SpawnReason.ENDER_PEARL);
-                                 }
-diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEndermite.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftEndermite.java
-index d657fd2c507a5b215aeab0a5f3e9c2ee892a27c8..3604d92c122b5c8be823098ce7b91e57e976589c 100644
---- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEndermite.java
-+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEndermite.java
-@@ -21,12 +21,12 @@ public class CraftEndermite extends CraftMonster implements Endermite {
- 
-     @Override
-     public boolean isPlayerSpawned() {
--        return false;
-+        return getHandle().isPlayerSpawned(); // Purpur - Add back player spawned endermite API
-     }
- 
-     @Override
-     public void setPlayerSpawned(boolean playerSpawned) {
--        // Nop
-+        getHandle().setPlayerSpawned(playerSpawned); // Purpur - Add back player spawned endermite API
-     }
-     // Paper start
-     @Override

purpur-api/paper-patches/files/src/main/java/org/bukkit/entity/Endermite.java.patch

@@ -1,14 +1,6 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: William Blake Galbreath <blake.galbreath@gmail.com>
-Date: Sat, 26 Jun 2021 22:08:57 -0500
-Subject: [PATCH] Add back player spawned endermite API
-
-
-diff --git a/src/main/java/org/bukkit/entity/Endermite.java b/src/main/java/org/bukkit/entity/Endermite.java
-index 7b379fb21e800a766ad022705a12dff6d42279ab..10a8d64ad2da0be2c14f34c3e7d1957c6f2883d1 100644
 --- a/src/main/java/org/bukkit/entity/Endermite.java
 +++ b/src/main/java/org/bukkit/entity/Endermite.java
-@@ -3,25 +3,21 @@ package org.bukkit.entity;
+@@ -3,25 +_,21 @@
  public interface Endermite extends Monster {
  
      /**

purpur-server/minecraft-patches/features/0001-Ridables.patch

@@ -42,7 +42,7 @@ index 7f136e044a243814372beef1400d3b6a148d2cbf..5e730cdde960603d5fa0fa7d1b70ec56
      public LevelChunk getChunkIfLoaded(int x, int z) {
          return this.chunkSource.getChunkAtIfLoadedImmediately(x, z); // Paper - Use getChunkIfLoadedImmediately
 diff --git a/net/minecraft/server/level/ServerPlayer.java b/net/minecraft/server/level/ServerPlayer.java
-index 78daeb23bb520774697c8d3d68aa4abe28a40cac..03d0df75dedd414aa54d88ed204cf82c3a4dfc88 100644
+index ed2b443cd1742772637f77bf1b094c2631d0c7df..477e195dfe753869fb3e4bfd4cf98188573f3574 100644
 --- a/net/minecraft/server/level/ServerPlayer.java
 +++ b/net/minecraft/server/level/ServerPlayer.java
 @@ -842,6 +842,15 @@ public class ServerPlayer extends Player implements ca.spottedleaf.moonrise.patc
@@ -3389,12 +3389,12 @@ index a252b2680131fa4af11c807d5fd5f942dcb0eb40..4feb8ebe2c50b7b1ba7e868cc3bd182a
          } else {
              boolean flag = damageSource.getDirectEntity() instanceof ThrownPotion;
 diff --git a/net/minecraft/world/entity/monster/Endermite.java b/net/minecraft/world/entity/monster/Endermite.java
-index 2a219c9ae39d7cbee8484b2a93bd278d913afe95..f412cebb5c350bf16f0bee710a4ae1df7c72c384 100644
+index 4e00daa6ece386f70502c074084b7b1b64caac2f..f4ab2e984dd87d2372aa10d2cbfd03a3f6fb1249 100644
 --- a/net/minecraft/world/entity/monster/Endermite.java
 +++ b/net/minecraft/world/entity/monster/Endermite.java
-@@ -34,14 +34,33 @@ public class Endermite extends Monster {
+@@ -45,14 +45,33 @@ public class Endermite extends Monster {
-         this.xpReward = 3;
      }
+     // Purpur end - Add back player spawned endermite API
  
 +    // Purpur start - Ridables
 +    @Override

purpur-server/minecraft-patches/features/0002-Configurable-entity-base-attributes.patch

@@ -23,7 +23,7 @@ index d0313fd5368baa53ec511c8c07fc78a1f1ecec4e..898b1e01026ec1f44cfe60e9f18a997c
      protected ParticleOptions getInkParticle() {
          return ParticleTypes.GLOW_SQUID_INK;
 diff --git a/net/minecraft/world/entity/LivingEntity.java b/net/minecraft/world/entity/LivingEntity.java
-index d7d147c5afa566db3fe9f843ee3f0e69b8a8cd12..d076e9f26af543fadd062e4dca5ccaafabe71cb2 100644
+index 35c0f89b0a2c7c920277e7b85230f787b781564b..4da15a9c9da346c9378575cbb7c804d8c23a92ca 100644
 --- a/net/minecraft/world/entity/LivingEntity.java
 +++ b/net/minecraft/world/entity/LivingEntity.java
 @@ -311,6 +311,7 @@ public abstract class LivingEntity extends Entity implements Attackable {
@@ -1068,10 +1068,10 @@ index 4feb8ebe2c50b7b1ba7e868cc3bd182a9801c631..c845481aa48c4c0d670058866351e1c9
      protected void registerGoals() {
          this.goalSelector.addGoal(0, new FloatGoal(this));
 diff --git a/net/minecraft/world/entity/monster/Endermite.java b/net/minecraft/world/entity/monster/Endermite.java
-index f412cebb5c350bf16f0bee710a4ae1df7c72c384..fd042f9900e39870208c6b358e490ea82741725f 100644
+index f4ab2e984dd87d2372aa10d2cbfd03a3f6fb1249..2ea45eba13d0b0ea2d3c1d1a3666d6e2e027a3ef 100644
 --- a/net/minecraft/world/entity/monster/Endermite.java
 +++ b/net/minecraft/world/entity/monster/Endermite.java
-@@ -51,6 +51,14 @@ public class Endermite extends Monster {
+@@ -62,6 +62,14 @@ public class Endermite extends Monster {
      }
      // Purpur end - Ridables
  

purpur-server/minecraft-patches/features/0018-Toggle-for-water-sensitive-mob-damage.patch

@@ -66,7 +66,7 @@ index 62fbaed0f81b900730ab22b969ffd48d31a268ce..5c8b88e8dca604d053c59106e64bfcf3
      public int getRemainingPersistentAngerTime() {
          return this.entityData.get(DATA_REMAINING_ANGER_TIME);
 diff --git a/net/minecraft/world/entity/animal/Cat.java b/net/minecraft/world/entity/animal/Cat.java
-index f0b7025e5a0d9f2aeb42dec388c1c532a46ece35..2c59f07b59e345db1b3e53854efb3b2d3d1311ae 100644
+index 584568cef949cee24aa7850d2ff99d47cd089a6e..b41ca04043e65f107edaebc49d398650898e35fb 100644
 --- a/net/minecraft/world/entity/animal/Cat.java
 +++ b/net/minecraft/world/entity/animal/Cat.java
 @@ -133,6 +133,13 @@ public class Cat extends TamableAnimal implements VariantHolder<Holder<CatVarian
@@ -246,7 +246,7 @@ index 450c7be36846bf4e95f84615fca893501415cdbc..d5d2b9656ec22536ccd9ddb0ebe48a19
      protected boolean canDispenserEquipIntoSlot(EquipmentSlot slot) {
          return slot == EquipmentSlot.MAINHAND && this.canPickUpLoot();
 diff --git a/net/minecraft/world/entity/animal/Parrot.java b/net/minecraft/world/entity/animal/Parrot.java
-index 1020e28a8c82b786a317098e2072d1a16f8964f0..4ac3b1d276ef842f46d1316e39f4a8765729f928 100644
+index f7efd5d2534a7b7d20e1951ffa6b0314434f82e2..ff8cd170064e6cfa943c228a1bc82ef7a5a45b7f 100644
 --- a/net/minecraft/world/entity/animal/Parrot.java
 +++ b/net/minecraft/world/entity/animal/Parrot.java
 @@ -201,6 +201,13 @@ public class Parrot extends ShoulderRidingEntity implements VariantHolder<Parrot
@@ -439,7 +439,7 @@ index edbccb7ca27aa8a1917eb8b35b3ba8600c91111a..cf297f766340b4ff8ecaf80a9a13b289
          this.entityData.set(HOME_POS, homePos);
      }
 diff --git a/net/minecraft/world/entity/animal/Wolf.java b/net/minecraft/world/entity/animal/Wolf.java
-index 3e1cb63c1658dccc3bee53ed82ff5b5b7f321afd..56cf038c4395e07ea8df0e72075445772977999a 100644
+index 136f2c43272e5a45e473b66656818ed88de1cff3..f2e2cee3fd4a8bdec0c8922170930f81c14dfb32 100644
 --- a/net/minecraft/world/entity/animal/Wolf.java
 +++ b/net/minecraft/world/entity/animal/Wolf.java
 @@ -217,6 +217,13 @@ public class Wolf extends TamableAnimal implements NeutralMob, VariantHolder<Hol
@@ -619,7 +619,7 @@ index cdff0fab8a256c1e06e280500a31d4a99659d1ee..a2642457d3c24a13a8becb4d743c42e6
          return createBaseHorseAttributes().add(Attributes.MAX_HEALTH, 15.0).add(Attributes.MOVEMENT_SPEED, 0.2F);
      }
 diff --git a/net/minecraft/world/entity/boss/enderdragon/EnderDragon.java b/net/minecraft/world/entity/boss/enderdragon/EnderDragon.java
-index ed8b68057b1ac2d1cfa7c0eed0d1f5f16918af6b..f997721ee6e9f04b59e2f4a7a5a8495eccc83072 100644
+index 724d259d4b793f2043e63dda9022bdfddc4dca38..b2a0ba6faa117ad781aaa3e6932482d4d9c8a789 100644
 --- a/net/minecraft/world/entity/boss/enderdragon/EnderDragon.java
 +++ b/net/minecraft/world/entity/boss/enderdragon/EnderDragon.java
 @@ -170,6 +170,13 @@ public class EnderDragon extends Mob implements Enemy {
@@ -637,7 +637,7 @@ index ed8b68057b1ac2d1cfa7c0eed0d1f5f16918af6b..f997721ee6e9f04b59e2f4a7a5a8495e
          return Mob.createMobAttributes().add(Attributes.MAX_HEALTH, 200.0);
      }
 diff --git a/net/minecraft/world/entity/boss/wither/WitherBoss.java b/net/minecraft/world/entity/boss/wither/WitherBoss.java
-index 96e0172c405970253827a6b6a83ebd441f496268..7468a9691116e5aa75eede3a4ef1d52821ba6cb7 100644
+index a9303429be73841480f81a8a6687787e5c169ddc..0bfb624fa2656ba416e02b645e92ec5814ea7156 100644
 --- a/net/minecraft/world/entity/boss/wither/WitherBoss.java
 +++ b/net/minecraft/world/entity/boss/wither/WitherBoss.java
 @@ -107,6 +107,13 @@ public class WitherBoss extends Monster implements RangedAttackMob {
@@ -771,10 +771,10 @@ index 7434c7bad021e474bf0ecbd1cb28a38b92f3586e..b76d47dfbc6a81497fc6d5dcc0be2297
  
      @Override
 diff --git a/net/minecraft/world/entity/monster/Endermite.java b/net/minecraft/world/entity/monster/Endermite.java
-index fd042f9900e39870208c6b358e490ea82741725f..ecb14cdab0496777c897137926de65a9c8f31d55 100644
+index 2ea45eba13d0b0ea2d3c1d1a3666d6e2e027a3ef..38e3b3ed2c003fe7bbb476f7bf9a882ea2de792a 100644
 --- a/net/minecraft/world/entity/monster/Endermite.java
 +++ b/net/minecraft/world/entity/monster/Endermite.java
-@@ -59,6 +59,13 @@ public class Endermite extends Monster {
+@@ -70,6 +70,13 @@ public class Endermite extends Monster {
      }
      // Purpur end - Configurable entity base attributes
  

purpur-server/minecraft-patches/sources/net/minecraft/world/entity/monster/Endermite.java.patch

@@ -0,0 +1,41 @@
+--- a/net/minecraft/world/entity/monster/Endermite.java
++++ b/net/minecraft/world/entity/monster/Endermite.java
+@@ -28,12 +_,23 @@
+ public class Endermite extends Monster {
+     private static final int MAX_LIFE = 2400;
+     public int life;
++    private boolean isPlayerSpawned; // Purpur - Add back player spawned endermite API
+ 
+     public Endermite(EntityType<? extends Endermite> entityType, Level level) {
+         super(entityType, level);
+         this.xpReward = 3;
+     }
+ 
++    // Purpur start - Add back player spawned endermite API
++    public boolean isPlayerSpawned() {
++        return this.isPlayerSpawned;
++    }
++
++    public void setPlayerSpawned(boolean playerSpawned) {
++        this.isPlayerSpawned = playerSpawned;
++    }
++    // Purpur end - Add back player spawned endermite API
++
+     @Override
+     protected void registerGoals() {
+         this.goalSelector.addGoal(1, new FloatGoal(this));
+@@ -79,12 +_,14 @@
+     public void readAdditionalSaveData(CompoundTag compound) {
+         super.readAdditionalSaveData(compound);
+         this.life = compound.getInt("Lifetime");
++        this.isPlayerSpawned = compound.getBoolean("PlayerSpawned"); // Purpur - Add back player spawned endermite API
+     }
+ 
+     @Override
+     public void addAdditionalSaveData(CompoundTag compound) {
+         super.addAdditionalSaveData(compound);
+         compound.putInt("Lifetime", this.life);
++        compound.putBoolean("PlayerSpawned", this.isPlayerSpawned); // Purpur - Add back player spawned endermite API
+     }
+ 
+     @Override

purpur-server/minecraft-patches/sources/net/minecraft/world/entity/projectile/ThrownEnderpearl.java.patch

@@ -1,6 +1,6 @@
 --- a/net/minecraft/world/entity/projectile/ThrownEnderpearl.java
 +++ b/net/minecraft/world/entity/projectile/ThrownEnderpearl.java
-@@ -133,7 +_,7 @@
+@@ -133,9 +_,10 @@
                              return;
                          }
                          // CraftBukkit end
@@ -8,7 +8,10 @@
 +                        if (this.random.nextFloat() < serverLevel.purpurConfig.enderPearlEndermiteChance && serverLevel.getGameRules().getBoolean(GameRules.RULE_DOMOBSPAWNING)) { // Purpur - Configurable Ender Pearl RNG
                              Endermite endermite = EntityType.ENDERMITE.create(serverLevel, EntitySpawnReason.TRIGGERED);
                              if (endermite != null) {
++                                endermite.setPlayerSpawned(true); // Purpur - Add back player spawned endermite API
                                  endermite.moveTo(owner.getX(), owner.getY(), owner.getZ(), owner.getYRot(), owner.getXRot());
+                                 serverLevel.addFreshEntity(endermite, org.bukkit.event.entity.CreatureSpawnEvent.SpawnReason.ENDER_PEARL);
+                             }
 @@ -155,7 +_,7 @@
                          if (serverPlayer1 != null) {
                              serverPlayer1.resetFallDistance();

purpur-server/paper-patches/files/src/main/java/org/bukkit/craftbukkit/entity/CraftEndermite.java.patch

@@ -0,0 +1,17 @@
+--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEndermite.java
++++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEndermite.java
+@@ -21,12 +_,12 @@
+ 
+     @Override
+     public boolean isPlayerSpawned() {
+-        return false;
++        return getHandle().isPlayerSpawned(); // Purpur - Add back player spawned endermite API
+     }
+ 
+     @Override
+     public void setPlayerSpawned(boolean playerSpawned) {
+-        // Nop
++        getHandle().setPlayerSpawned(playerSpawned); // Purpur - Add back player spawned endermite API
+     }
+     // Paper start
+     @Override