SteamWar/Paper
10
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix drops for shearing mushroom cow (#11632)

Browse Source
This commit is contained in:
Lulu13022002
2024-11-19 11:14:19 +01:00
parent 1cc1ee1676
commit 5ada2514df
1 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
patches/server/Add-drops-to-shear-events.patch
View File

@@ -113,13 +113,12 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
- } - }
- worldserver1.addFreshEntity(entityitem); - worldserver1.addFreshEntity(entityitem);
- // CraftBukkit end - // CraftBukkit end
- }
-
+ // Paper start - custom shear drops; moved drop generation to separate method + // Paper start - custom shear drops; moved drop generation to separate method
+ drops.forEach(itemstack1 -> { + drops.forEach(drop -> {
+ for (final ItemStack drop : drops) {
+ ItemEntity entityitem = new ItemEntity(this.level(), this.getX(), this.getY(1.0D), this.getZ(), drop); + ItemEntity entityitem = new ItemEntity(this.level(), this.getX(), this.getY(1.0D), this.getZ(), drop);
+ this.spawnAtLocation(world, entityitem); + this.spawnAtLocation(world, entityitem);
}
-
+ // Paper end - custom shear drops; moved drop generation to separate method + // Paper end - custom shear drops; moved drop generation to separate method
}); });
}, EntityTransformEvent.TransformReason.SHEARED, org.bukkit.event.entity.CreatureSpawnEvent.SpawnReason.SHEARED); // CraftBukkit }, EntityTransformEvent.TransformReason.SHEARED, org.bukkit.event.entity.CreatureSpawnEvent.SpawnReason.SHEARED); // CraftBukkit
@@ -177,8 +176,11 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
+ drops.forEach(itemstack1 -> { // Paper - custom drops - loop in generated default drops + drops.forEach(itemstack1 -> { // Paper - custom drops - loop in generated default drops
+ if (true) { // Paper - custom drops - loop in generated default drops + if (true) { // Paper - custom drops - loop in generated default drops
this.forceDrops = true; // CraftBukkit this.forceDrops = true; // CraftBukkit
ItemEntity entityitem = this.spawnAtLocation(worldserver1, itemstack1.copyWithCount(1), 1.0F); - ItemEntity entityitem = this.spawnAtLocation(worldserver1, itemstack1.copyWithCount(1), 1.0F);
+ ItemEntity entityitem = this.spawnAtLocation(worldserver1, itemstack1, 1.0F); // Paper - custom drops - copy already done above
this.forceDrops = false; // CraftBukkit this.forceDrops = false; // CraftBukkit
if (entityitem != null) {
diff --git a/src/main/java/net/minecraft/world/entity/animal/SnowGolem.java b/src/main/java/net/minecraft/world/entity/animal/SnowGolem.java diff --git a/src/main/java/net/minecraft/world/entity/animal/SnowGolem.java b/src/main/java/net/minecraft/world/entity/animal/SnowGolem.java
index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644 index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
--- a/src/main/java/net/minecraft/world/entity/animal/SnowGolem.java --- a/src/main/java/net/minecraft/world/entity/animal/SnowGolem.java