2022-03-04 20:47:30 +01:00
|
|
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
|
|
From: Nassim Jahnke <jahnke.nassim@gmail.com>
|
|
|
|
Date: Fri, 4 Mar 2022 20:35:19 +0100
|
|
|
|
Subject: [PATCH] Fix falling block spawn methods
|
|
|
|
|
2022-04-30 18:27:41 +02:00
|
|
|
Restores the API behavior from previous versions of the server
|
|
|
|
- Do not call API events
|
|
|
|
- Do not replace the existing block in the world
|
2022-03-04 20:47:30 +01:00
|
|
|
|
|
|
|
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftRegionAccessor.java b/src/main/java/org/bukkit/craftbukkit/CraftRegionAccessor.java
|
2022-06-08 15:12:28 +02:00
|
|
|
index d1fca0e3227b5f37c11367548be362f5a49b6a71..5628940cd3c3566c5db2beda506d4f20b6e3cbae 100644
|
2022-03-04 20:47:30 +01:00
|
|
|
--- a/src/main/java/org/bukkit/craftbukkit/CraftRegionAccessor.java
|
|
|
|
+++ b/src/main/java/org/bukkit/craftbukkit/CraftRegionAccessor.java
|
2022-06-08 15:12:28 +02:00
|
|
|
@@ -566,7 +566,7 @@ public abstract class CraftRegionAccessor implements RegionAccessor {
|
2022-03-04 20:47:30 +01:00
|
|
|
// Paper end
|
|
|
|
} else if (FallingBlock.class.isAssignableFrom(clazz)) {
|
|
|
|
BlockPos pos = new BlockPos(x, y, z);
|
|
|
|
- entity = FallingBlockEntity.fall(world, pos, this.getHandle().getBlockState(pos));
|
|
|
|
+ entity = new FallingBlockEntity(world, x, y, z, this.getHandle().getBlockState(pos)); // Paper
|
|
|
|
} else if (Projectile.class.isAssignableFrom(clazz)) {
|
|
|
|
if (Snowball.class.isAssignableFrom(clazz)) {
|
|
|
|
entity = new net.minecraft.world.entity.projectile.Snowball(world, x, y, z);
|
|
|
|
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
|
2022-06-08 15:12:28 +02:00
|
|
|
index ee0ae10b555cf21e1e618bb3bc173c3be0e4ff2c..105869020cd5b056b984c57f7196e9256e07b83e 100644
|
2022-03-04 20:47:30 +01:00
|
|
|
--- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
|
|
|
|
+++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
|
2022-06-05 22:51:44 +02:00
|
|
|
@@ -1411,7 +1411,12 @@ public class CraftWorld extends CraftRegionAccessor implements World {
|
2022-03-04 20:47:30 +01:00
|
|
|
Validate.notNull(material, "Material cannot be null");
|
|
|
|
Validate.isTrue(material.isBlock(), "Material must be a block");
|
|
|
|
|
2022-04-30 18:27:41 +02:00
|
|
|
- FallingBlockEntity entity = FallingBlockEntity.fall(world, new BlockPos(location.getX(), location.getY(), location.getZ()), CraftMagicNumbers.getBlock(material).defaultBlockState(), SpawnReason.CUSTOM);
|
|
|
|
+ // Paper start - restore API behavior for spawning falling blocks
|
2022-03-04 20:47:30 +01:00
|
|
|
+ FallingBlockEntity entity = new FallingBlockEntity(this.world, location.getX(), location.getY(), location.getZ(), CraftMagicNumbers.getBlock(material).defaultBlockState()); // Paper
|
2022-04-30 18:27:41 +02:00
|
|
|
+ entity.time = 1;
|
|
|
|
+
|
|
|
|
+ this.world.addFreshEntity(entity, SpawnReason.CUSTOM);
|
|
|
|
+ // Paper end
|
|
|
|
return (FallingBlock) entity.getBukkitEntity();
|
|
|
|
}
|
2022-03-04 20:47:30 +01:00
|
|
|
|
2022-06-05 22:51:44 +02:00
|
|
|
@@ -1420,7 +1425,12 @@ public class CraftWorld extends CraftRegionAccessor implements World {
|
2022-03-04 20:47:30 +01:00
|
|
|
Validate.notNull(location, "Location cannot be null");
|
2022-04-30 18:27:41 +02:00
|
|
|
Validate.notNull(data, "BlockData cannot be null");
|
2022-03-04 20:47:30 +01:00
|
|
|
|
2022-04-30 18:27:41 +02:00
|
|
|
- FallingBlockEntity entity = FallingBlockEntity.fall(world, new BlockPos(location.getX(), location.getY(), location.getZ()), ((CraftBlockData) data).getState(), SpawnReason.CUSTOM);
|
|
|
|
+ // Paper start - restore API behavior for spawning falling blocks
|
|
|
|
+ FallingBlockEntity entity = new FallingBlockEntity(this.world, location.getX(), location.getY(), location.getZ(), ((CraftBlockData) data).getState());
|
|
|
|
+ entity.time = 1;
|
|
|
|
+
|
|
|
|
+ this.world.addFreshEntity(entity, SpawnReason.CUSTOM);
|
|
|
|
+ // Paper end
|
|
|
|
return (FallingBlock) entity.getBukkitEntity();
|
|
|
|
}
|
2022-03-04 20:47:30 +01:00
|
|
|
|