From f1df8d07bbbbc84f9343e8710af62ade27ab5324 Mon Sep 17 00:00:00 2001 From: CocoTheOwner Date: Mon, 16 Aug 2021 18:50:14 +0200 Subject: [PATCH] Spawn entity using block instead of tile since it was causing issues https://pastebin.com/gwXGK8qd --- .../com/volmit/iris/engine/object/entity/IrisEntitySpawn.java | 2 +- .../com/volmit/iris/engine/object/spawners/IrisSurface.java | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/volmit/iris/engine/object/entity/IrisEntitySpawn.java b/src/main/java/com/volmit/iris/engine/object/entity/IrisEntitySpawn.java index 8a811e5af..8c2532115 100644 --- a/src/main/java/com/volmit/iris/engine/object/entity/IrisEntitySpawn.java +++ b/src/main/java/com/volmit/iris/engine/object/entity/IrisEntitySpawn.java @@ -134,7 +134,7 @@ public class IrisEntitySpawn implements IRare { try { IrisEntity irisEntity = getRealEntity(g); - if (!irisEntity.getSurface().matches(at.clone().subtract(0, 1, 0).getBlock().getState())) + if (!irisEntity.getSurface().matches(at.clone().subtract(0, 1, 0).getBlock())) return null; //Make sure it can spawn on the block Entity e = irisEntity.spawn(g, at.add(0.5, 0, 0.5), rng.aquire(() -> new RNG(g.getTarget().getWorld().seed() + 4))); diff --git a/src/main/java/com/volmit/iris/engine/object/spawners/IrisSurface.java b/src/main/java/com/volmit/iris/engine/object/spawners/IrisSurface.java index e3d5fad68..6baf9ee2a 100644 --- a/src/main/java/com/volmit/iris/engine/object/spawners/IrisSurface.java +++ b/src/main/java/com/volmit/iris/engine/object/spawners/IrisSurface.java @@ -20,6 +20,7 @@ package com.volmit.iris.engine.object.spawners; import com.volmit.iris.engine.object.annotations.Desc; import org.bukkit.Material; +import org.bukkit.block.Block; import org.bukkit.block.BlockState; import org.bukkit.block.data.Waterlogged; @@ -47,7 +48,7 @@ public enum IrisSurface { * @param state The blockstate * @return True if it matches */ - public boolean matches(BlockState state) { + public boolean matches(Block state) { Material type = state.getType(); if (type.isSolid()) { return this == LAND || this == OVERWORLD || (this == ANIMAL