craftbukkit/nms-patches/net/minecraft/server/level/RegionLimitedWorldAccess.patch

26 lines
1.1 KiB
Diff
Raw Normal View History

2021-03-16 09:00:00 +11:00
--- a/net/minecraft/server/level/RegionLimitedWorldAccess.java
+++ b/net/minecraft/server/level/RegionLimitedWorldAccess.java
2022-07-28 04:00:00 +10:00
@@ -207,7 +207,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);
2022-07-28 04:00:00 +10:00
@@ -326,6 +326,13 @@
2018-07-15 10:00:00 +10:00
2019-04-23 12:00:00 +10:00
@Override
2021-11-22 09:00:00 +11:00
public boolean addFreshEntity(Entity entity) {
2019-04-23 12:00:00 +10:00
+ // CraftBukkit start
2021-11-22 09:00:00 +11:00
+ return addFreshEntity(entity, org.bukkit.event.entity.CreatureSpawnEvent.SpawnReason.DEFAULT);
2018-07-15 10:00:00 +10:00
+ }
+
+ @Override
2021-11-22 09:00:00 +11:00
+ public boolean addFreshEntity(Entity entity, org.bukkit.event.entity.CreatureSpawnEvent.SpawnReason reason) {
2018-07-15 10:00:00 +10:00
+ // CraftBukkit end
2021-11-22 09:00:00 +11:00
int i = SectionPosition.blockToSectionCoord(entity.getBlockX());
int j = SectionPosition.blockToSectionCoord(entity.getBlockZ());
2018-07-15 10:00:00 +10:00