Fix charged creeper explosions not dropping mob skulls (#13167)

Author: Doc94

build-data/paper.at

@@ -365,6 +365,7 @@ public net.minecraft.world.entity.item.ItemEntity target
 public net.minecraft.world.entity.item.ItemEntity thrower
 public net.minecraft.world.entity.item.PrimedTnt explosionPower
 public net.minecraft.world.entity.item.PrimedTnt owner
+public net.minecraft.world.entity.monster.Creeper droppedSkulls
 public net.minecraft.world.entity.monster.Creeper explodeCreeper()V
 public net.minecraft.world.entity.monster.Creeper explosionRadius
 public net.minecraft.world.entity.monster.Creeper maxSwell

paper-server/patches/features/0001-Moonrise-optimisation-patches.patch

@@ -28098,7 +28098,7 @@ index 8cc5c0716392ba06501542ff5cbe71ee43979e5d..09fd99c9cbd23b5f3c899bfb00c9b896
 +    // Paper end - block counting
  }
 diff --git a/net/minecraft/world/entity/Entity.java b/net/minecraft/world/entity/Entity.java
-index 86d3cd1dc2a866e078e449f077c9ea1a852fcd98..7eda7cb9e7030e31279a94b0c1087e800f025b46 100644
+index 75f8f00c4b05390e0884f33aac260ed76c49123c..8f9af51af8457f1356efd401ea46565310e25059 100644
 --- a/net/minecraft/world/entity/Entity.java
 +++ b/net/minecraft/world/entity/Entity.java
 @@ -149,7 +149,7 @@ import net.minecraft.world.waypoints.WaypointTransmitter;
@@ -28451,7 +28451,7 @@ index 86d3cd1dc2a866e078e449f077c9ea1a852fcd98..7eda7cb9e7030e31279a94b0c1087e80
      }
 
      private static float[] collectCandidateStepUpHeights(AABB box, List<VoxelShape> colliders, float deltaY, float maxUpStep) {
-@@ -2705,21 +2853,110 @@ public abstract class Entity implements SyncedDataHolder, DebugValueSource, Name
+@@ -2704,21 +2852,110 @@ public abstract class Entity implements SyncedDataHolder, DebugValueSource, Name
      }
 
      public boolean isInWall() {
@@ -28573,7 +28573,7 @@ index 86d3cd1dc2a866e078e449f077c9ea1a852fcd98..7eda7cb9e7030e31279a94b0c1087e80
      }
 
      public InteractionResult interact(Player player, InteractionHand hand) {
-@@ -4332,15 +4569,17 @@ public abstract class Entity implements SyncedDataHolder, DebugValueSource, Name
+@@ -4331,15 +4568,17 @@ public abstract class Entity implements SyncedDataHolder, DebugValueSource, Name
      }
 
      public Iterable<Entity> getIndirectPassengers() {
@@ -28599,7 +28599,7 @@ index 86d3cd1dc2a866e078e449f077c9ea1a852fcd98..7eda7cb9e7030e31279a94b0c1087e80
      }
 
      public int countPlayerPassengers() {
-@@ -4483,77 +4722,126 @@ public abstract class Entity implements SyncedDataHolder, DebugValueSource, Name
+@@ -4482,77 +4721,126 @@ public abstract class Entity implements SyncedDataHolder, DebugValueSource, Name
          return Mth.lerp(partialTick, this.yRotO, this.yRot);
      }
 
@@ -28784,7 +28784,7 @@ index 86d3cd1dc2a866e078e449f077c9ea1a852fcd98..7eda7cb9e7030e31279a94b0c1087e80
 
      public boolean touchingUnloadedChunk() {
          AABB aabb = this.getBoundingBox().inflate(1.0);
-@@ -4709,6 +4997,15 @@ public abstract class Entity implements SyncedDataHolder, DebugValueSource, Name
+@@ -4708,6 +4996,15 @@ public abstract class Entity implements SyncedDataHolder, DebugValueSource, Name
      }
 
      public final void setPosRaw(double x, double y, double z, boolean forceBoundingBoxUpdate) {
@@ -28800,7 +28800,7 @@ index 86d3cd1dc2a866e078e449f077c9ea1a852fcd98..7eda7cb9e7030e31279a94b0c1087e80
          if (!checkPosition(this, x, y, z)) {
              return;
          }
-@@ -4860,6 +5157,12 @@ public abstract class Entity implements SyncedDataHolder, DebugValueSource, Name
+@@ -4859,6 +5156,12 @@ public abstract class Entity implements SyncedDataHolder, DebugValueSource, Name
 
      @Override
      public final void setRemoved(Entity.RemovalReason removalReason, @Nullable org.bukkit.event.entity.EntityRemoveEvent.Cause cause) { // CraftBukkit - add Bukkit remove cause
@@ -28813,7 +28813,7 @@ index 86d3cd1dc2a866e078e449f077c9ea1a852fcd98..7eda7cb9e7030e31279a94b0c1087e80
          org.bukkit.craftbukkit.event.CraftEventFactory.callEntityRemoveEvent(this, cause); // CraftBukkit
          final boolean alreadyRemoved = this.removalReason != null; // Paper - Folia schedulers
          if (this.removalReason == null) {
-@@ -4870,7 +5173,7 @@ public abstract class Entity implements SyncedDataHolder, DebugValueSource, Name
+@@ -4869,7 +5172,7 @@ public abstract class Entity implements SyncedDataHolder, DebugValueSource, Name
              this.stopRiding();
          }
 
@@ -28822,7 +28822,7 @@ index 86d3cd1dc2a866e078e449f077c9ea1a852fcd98..7eda7cb9e7030e31279a94b0c1087e80
          this.levelCallback.onRemove(removalReason);
          this.onRemoval(removalReason);
          // Paper start - Folia schedulers
-@@ -4904,7 +5207,7 @@ public abstract class Entity implements SyncedDataHolder, DebugValueSource, Name
+@@ -4903,7 +5206,7 @@ public abstract class Entity implements SyncedDataHolder, DebugValueSource, Name
      public boolean shouldBeSaved() {
          return (this.removalReason == null || this.removalReason.shouldSave())
              && !this.isPassenger()

paper-server/patches/features/0005-Entity-Activation-Range-2.0.patch

@@ -464,7 +464,7 @@ index 35e852c4bb5e632ac4e1dc8c9e89f7a366ba7c09..f500e724034b330b590825c07b7dd615
      public void tick() {
          super.tick();
 diff --git a/net/minecraft/world/entity/Entity.java b/net/minecraft/world/entity/Entity.java
-index c5d45f86eda48ee18986c4198b96d031b8028bb2..450fdc0df04cbcc8f0c6ecbfc015f0d744e4a96d 100644
+index 8f9af51af8457f1356efd401ea46565310e25059..07f27ff55628eef2caa28c96aa15e46cb9db2392 100644
 --- a/net/minecraft/world/entity/Entity.java
 +++ b/net/minecraft/world/entity/Entity.java
 @@ -368,6 +368,15 @@ public abstract class Entity implements SyncedDataHolder, DebugValueSource, Name
@@ -523,10 +523,10 @@ index c5d45f86eda48ee18986c4198b96d031b8028bb2..450fdc0df04cbcc8f0c6ecbfc015f0d7
              movement = this.maybeBackOffFromEdge(movement, type);
              Vec3 vec3 = this.collide(movement);
 diff --git a/net/minecraft/world/entity/LivingEntity.java b/net/minecraft/world/entity/LivingEntity.java
-index 0e64b71f653135162296bda070a4a87385cec6ca..be602f3d82960fc5e2592dc688418b0ac3c670a1 100644
+index 3de638d16192262f1b172a1f15101daf6a72aaf4..d9c7b7cc01fe4a7d6554e93c939e657994054249 100644
 --- a/net/minecraft/world/entity/LivingEntity.java
 +++ b/net/minecraft/world/entity/LivingEntity.java
-@@ -3246,6 +3246,14 @@ public abstract class LivingEntity extends Entity implements Attackable, Waypoin
+@@ -3252,6 +3252,14 @@ public abstract class LivingEntity extends Entity implements Attackable, Waypoin
          return false;
      }
 

paper-server/patches/features/0026-Optimise-EntityScheduler-ticking.patch

@@ -67,10 +67,10 @@ index d5f3083354d70c4da3c39e2f909ce4c7e170295c..4b1ffb5396138fc0d165ac647797b83f
          io.papermc.paper.adventure.providers.ClickCallbackProviderImpl.DIALOG_CLICK_MANAGER.handleQueue(this.tickCount); // Paper
          profilerFiller.push("commandFunctions");
 diff --git a/net/minecraft/world/entity/Entity.java b/net/minecraft/world/entity/Entity.java
-index 16070e63d1a8e4d32aa0d812bb11f8f41e09fe3c..218395a721cbf1d39a52f1a8f2b30be1b3885250 100644
+index 07f27ff55628eef2caa28c96aa15e46cb9db2392..afacfc6fe52842c49ca3a63e2a37891a6c2f4867 100644
 --- a/net/minecraft/world/entity/Entity.java
 +++ b/net/minecraft/world/entity/Entity.java
-@@ -5224,6 +5224,11 @@ public abstract class Entity implements SyncedDataHolder, DebugValueSource, Name
+@@ -5223,6 +5223,11 @@ public abstract class Entity implements SyncedDataHolder, DebugValueSource, Name
          this.getBukkitEntity().taskScheduler.retire();
      }
      // Paper end - Folia schedulers

paper-server/patches/sources/net/minecraft/world/entity/Entity.java.patch

@@ -956,7 +956,7 @@
      protected abstract void addAdditionalSaveData(ValueOutput output);
 
      @Nullable
-@@ -2092,11 +_,63 @@
+@@ -2092,11 +_,62 @@
 
      @Nullable
      public ItemEntity spawnAtLocation(ServerLevel level, ItemStack stack, Vec3 offset) {
@@ -985,6 +985,7 @@
              return null;
          } else {
 -            ItemEntity itemEntity = new ItemEntity(level, this.getX() + offset.x, this.getY() + offset.y, this.getZ() + offset.z, stack);
+-            itemEntity.setDefaultPickUpDelay();
 +            // CraftBukkit start - Capture drops for death event
 +            if (this instanceof net.minecraft.world.entity.LivingEntity && !this.forceDrops) {
 +                // Paper start - Restore vanilla drops behavior
@@ -1001,7 +1002,6 @@
 +            ItemEntity itemEntity = new ItemEntity(level, this.getX() + offset.x, this.getY() + offset.y, this.getZ() + offset.z, stack.copy()); // Paper - copy so we can destroy original
 +            stack.setCount(0); // Paper - destroy this item - if this ever leaks due to game bugs, ensure it doesn't dupe
 +
-             itemEntity.setDefaultPickUpDelay();
 +            itemEntity.setDefaultPickUpDelay(); // Paper - diff on change (in dropConsumer)
 +            // Paper start - Call EntityDropItemEvent
 +            return this.spawnAtLocation(level, itemEntity);

paper-server/patches/sources/net/minecraft/world/entity/LivingEntity.java.patch

@@ -795,7 +795,7 @@
              if (killCredit != null) {
                  killCredit.awardKillScore(this, damageSource);
              }
-@@ -1439,68 +_,141 @@
+@@ -1439,68 +_,147 @@
              }
 
              if (!this.level().isClientSide() && this.hasCustomName()) {
@@ -811,6 +811,9 @@
 -                if (entity == null || entity.killedEntity(serverLevel, this, damageSource)) {
 +                // Paper - move below into if for onKill
 +                // Paper start
++                if (entity instanceof net.minecraft.world.entity.monster.Creeper creeper) { // Creeper has logic for drops we need capture
++                    creeper.killedEntity((ServerLevel) this.level(), this, damageSource);
++                }
 +                org.bukkit.event.entity.EntityDeathEvent deathEvent = this.dropAllDeathLoot(serverLevel, damageSource);
 +                if (deathEvent == null || !deathEvent.isCancelled()) {
 +                    //if (entityliving != null) { // Paper - Fix item duplication and teleport issues; moved to be run earlier in #dropAllDeathLoot before destroying the drop items in CraftEventFactory#callEntityDeathEvent
@@ -842,6 +845,9 @@
 +                } else {
 +                    this.dead = false;
 +                    this.setHealth((float) deathEvent.getReviveHealth());
++                    if (entity instanceof net.minecraft.world.entity.monster.Creeper creeper && creeper.droppedSkulls) { // Creeper has logic for drops skull and need revert that flag
++                        creeper.droppedSkulls = false;
++                    }
 +                }
 +                // Paper end
                      this.createWitherRose(killCredit);

paper-server/patches/sources/net/minecraft/world/entity/monster/Creeper.java.patch

@@ -3,7 +3,7 @@
 @@ -55,6 +_,7 @@
      public int maxSwell = 30;
      public int explosionRadius = 3;
-     private boolean droppedSkulls;
+     public boolean droppedSkulls;
 +    public @Nullable Entity entityIgniter; // CraftBukkit
 
      public Creeper(EntityType<? extends Creeper> type, Level level) {