9
0
mirror of https://github.com/VolmitSoftware/Iris.git synced 2025-12-29 03:59:06 +00:00

Jigsaw fixes

This commit is contained in:
Daniel Mills
2021-01-28 00:28:55 -05:00
parent 66dde6c215
commit 4a05031a0f
14 changed files with 182 additions and 15 deletions

View File

@@ -279,11 +279,6 @@ public class IrisEntity extends IrisRegistrant
return Iris.linkMythicMobs.spawn(getMythicalType(), at);
}
if(isCitizens())
{
// TODO: return Iris.linkCitizens.spawn(getType(), at); SPAWN SOME TYPE TOO
}
return at.getWorld().spawnEntity(at, getType());
}

View File

@@ -18,7 +18,6 @@ import org.bukkit.entity.Entity;
@Data
public class IrisEntityInitialSpawn
{
@RegistryListEntity
@Required
@DontObfuscate

View File

@@ -40,6 +40,11 @@ public class IrisJigsawPieceConnector
@Required
private KList<String> pools = new KList<>();
@RegistryListEntity
@DontObfuscate
@Desc("Pick an entity to spawn on this connector")
private String spawnEntity;
@DontObfuscate
@Desc("The relative position this connector is located at for connecting to other pieces")
@Required
@@ -63,6 +68,7 @@ public class IrisJigsawPieceConnector
c.setDirection(getDirection());
c.setRotateConnector(isRotateConnector());
c.setName(getName());
c.setSpawnEntity(getSpawnEntity());
c.setPools(getPools().copy());
return c;
}