This commit is contained in:
Daniel Mills 2020-09-13 09:15:04 -04:00
parent 639294af2d
commit ef4037274d
3 changed files with 9 additions and 1 deletions

View File

@ -191,7 +191,12 @@ public class IrisTerrainProvider extends SkyTerrainProvider implements IrisConte
@Override @Override
protected void onPlayerJoin(Player p) protected void onPlayerJoin(Player p)
{ {
if(getDimension().getResourcePack().trim().isEmpty())
{
return;
}
p.setResourcePack(getDimension().getResourcePack());
} }
@Override @Override

View File

@ -54,6 +54,10 @@ public class IrisDimension extends IrisRegistrant
@Desc("Create an inverted dimension in the sky (like the nether)") @Desc("Create an inverted dimension in the sky (like the nether)")
private IrisDimension sky = null; private IrisDimension sky = null;
@DontObfuscate
@Desc("Upon joining this world, Iris will send a resource pack request to the client. If they have previously selected yes, it will auto-switch depending on which dimension they go to.")
private String resourcePack = "";
@DontObfuscate @DontObfuscate
@Desc("Place text on terrain") @Desc("Place text on terrain")
@ArrayType(min = 1, type = IrisTextPlacement.class) @ArrayType(min = 1, type = IrisTextPlacement.class)

View File

@ -39,7 +39,6 @@ import lombok.experimental.Accessors;
@Data @Data
public class IrisLoot public class IrisLoot
{ {
@DontObfuscate @DontObfuscate
@Desc("The target inventory slot types to fill this loot with") @Desc("The target inventory slot types to fill this loot with")
private InventorySlotType slotTypes = InventorySlotType.STORAGE; private InventorySlotType slotTypes = InventorySlotType.STORAGE;