0
0
mirror of https://hub.spigotmc.org/stash/scm/spigot/craftbukkit.git synced 2024-11-24 19:16:15 +00:00
craftbukkit/nms-patches/net/minecraft/server/level/RegionLimitedWorldAccess.patch
2024-06-14 01:05:00 +10:00

26 lines
1.1 KiB
Diff

--- a/net/minecraft/server/level/RegionLimitedWorldAccess.java
+++ b/net/minecraft/server/level/RegionLimitedWorldAccess.java
@@ -217,7 +217,7 @@
if (iblockdata.isAir()) {
return false;
} else {
- if (flag) {
+ if (false) { // CraftBukkit - SPIGOT-6833: Do not drop during world generation
TileEntity tileentity = iblockdata.hasBlockEntity() ? this.getBlockEntity(blockposition) : null;
Block.dropResources(iblockdata, this.level, blockposition, tileentity, entity, ItemStack.EMPTY);
@@ -336,6 +336,13 @@
@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 = SectionPosition.blockToSectionCoord(entity.getBlockX());
int j = SectionPosition.blockToSectionCoord(entity.getBlockZ());