aboutsummaryrefslogtreecommitdiffhomepage
path: root/patch-remap/mache-spigotflower-stripped/net/minecraft/server/level/WorldGenRegion.java.patch
diff options
context:
space:
mode:
Diffstat (limited to 'patch-remap/mache-spigotflower-stripped/net/minecraft/server/level/WorldGenRegion.java.patch')
-rw-r--r--patch-remap/mache-spigotflower-stripped/net/minecraft/server/level/WorldGenRegion.java.patch27
1 files changed, 27 insertions, 0 deletions
diff --git a/patch-remap/mache-spigotflower-stripped/net/minecraft/server/level/WorldGenRegion.java.patch b/patch-remap/mache-spigotflower-stripped/net/minecraft/server/level/WorldGenRegion.java.patch
new file mode 100644
index 0000000000..e5539e27fd
--- /dev/null
+++ b/patch-remap/mache-spigotflower-stripped/net/minecraft/server/level/WorldGenRegion.java.patch
@@ -0,0 +1,27 @@
+--- a/net/minecraft/server/level/WorldGenRegion.java
++++ b/net/minecraft/server/level/WorldGenRegion.java
+@@ -221,8 +208,8 @@
+ if (blockstate.isAir()) {
+ return false;
+ } else {
+- if (flag) {
+- BlockEntity blockentity = blockstate.hasBlockEntity() ? this.getBlockEntity(blockpos) : null;
++ if (false) { // CraftBukkit - SPIGOT-6833: Do not drop during world generation
++ BlockEntity tileentity = iblockdata.hasBlockEntity() ? this.getBlockEntity(pos) : null;
+
+ Block.dropResources(blockstate, this.level, blockpos, blockentity, entity, ItemStack.EMPTY);
+ }
+@@ -344,6 +327,13 @@
+ @Override
+ @Override
+ public boolean addFreshEntity(Entity entity) {
++ // CraftBukkit start
++ return addFreshEntity(entity, org.bukkit.event.entity.CreatureSpawnEvent.SpawnReason.DEFAULT);
++ }
++
++ @Override
++ public boolean addFreshEntity(Entity entity, org.bukkit.event.entity.CreatureSpawnEvent.SpawnReason reason) {
++ // CraftBukkit end
+ int i = SectionPos.blockToSectionCoord(entity.getBlockX());
+ int j = SectionPos.blockToSectionCoord(entity.getBlockZ());
+