Skip to content

Commit e81f855

Browse files
Replace deprecated bukkit api usage
1 parent f2f6c79 commit e81f855

File tree

2 files changed

+8
-3
lines changed

2 files changed

+8
-3
lines changed

fabric/src/main/java/me/moros/bending/fabric/mixin/entity/LivingEntityMixin.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@
3333
import net.minecraft.world.level.storage.loot.parameters.LootContextParams;
3434
import org.spongepowered.asm.mixin.Mixin;
3535
import org.spongepowered.asm.mixin.Shadow;
36+
import org.spongepowered.asm.mixin.Unique;
3637
import org.spongepowered.asm.mixin.injection.At;
3738
import org.spongepowered.asm.mixin.injection.Inject;
3839
import org.spongepowered.asm.mixin.injection.ModifyVariable;
@@ -74,6 +75,7 @@ public abstract class LivingEntityMixin extends EntityMixin {
7475
ci.cancel();
7576
}
7677

78+
@Unique
7779
private LivingEntity get() {
7880
return (LivingEntity) (Object) this;
7981
}

paper/src/main/java/me/moros/bending/paper/platform/world/BukkitWorld.java

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,7 @@
4747
import org.bukkit.Location;
4848
import org.bukkit.World.Environment;
4949
import org.bukkit.block.TileState;
50+
import org.bukkit.entity.FallingBlock;
5051
import org.bukkit.util.BoundingBox;
5152
import org.bukkit.util.RayTraceResult;
5253
import org.bukkit.util.Vector;
@@ -205,9 +206,11 @@ public Entity dropItem(Position pos, ItemSnapshot item, boolean canPickup) {
205206
public Entity createFallingBlock(Position pos, BlockState state, boolean gravity) {
206207
var loc = new Location(handle(), pos.x(), pos.y(), pos.z());
207208
var data = PlatformAdapter.toBukkitData(state);
208-
var bukkitEntity = handle().spawnFallingBlock(loc, data);
209-
bukkitEntity.setGravity(gravity);
210-
bukkitEntity.setDropItem(false);
209+
var bukkitEntity = handle().spawn(loc, FallingBlock.class, fb -> {
210+
fb.setBlockData(data);
211+
fb.setGravity(gravity);
212+
fb.setDropItem(false);
213+
});
211214
return PlatformAdapter.fromBukkitEntity(bukkitEntity);
212215
}
213216

0 commit comments

Comments
 (0)