From 315a8e2e0dd635b599a97816084922e0c4375f27 Mon Sep 17 00:00:00 2001
From: CreepyCre <CreepyCre@gmail.com>
Date: Sat, 13 Feb 2021 14:05:25 +0100
Subject: [PATCH] added "setup_loot" boolean to PocketGenerator

---
 .../dimdoors/pockets/generator/PocketGenerator.java      | 9 +++++++++
 .../virtual/reference/PocketGeneratorReference.java      | 2 +-
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/src/main/java/org/dimdev/dimdoors/pockets/generator/PocketGenerator.java b/src/main/java/org/dimdev/dimdoors/pockets/generator/PocketGenerator.java
index 8a2bafde..130ed60c 100644
--- a/src/main/java/org/dimdev/dimdoors/pockets/generator/PocketGenerator.java
+++ b/src/main/java/org/dimdev/dimdoors/pockets/generator/PocketGenerator.java
@@ -41,6 +41,7 @@ public abstract class PocketGenerator implements Weighted<PocketGenerationParame
 
 	private String weight;
 	private Equation weightEquation;
+	private Boolean setupLoot;
 
 	private final List<String> tags = new ArrayList<>();
 
@@ -83,6 +84,8 @@ public abstract class PocketGenerator implements Weighted<PocketGenerationParame
 		this.weight = tag.contains("weight") ? tag.getString("weight") : defaultWeightEquation;
 		parseWeight();
 
+		if (tag.contains("setup_loot")) setupLoot = tag.getBoolean("setup_loot");
+
 		if (tag.contains("modifiers")) {
 			ListTag modifiersTag = tag.getList("modifiers", 10);
 			for (int i = 0; i < modifiersTag.size(); i++) {
@@ -104,6 +107,8 @@ public abstract class PocketGenerator implements Weighted<PocketGenerationParame
 
 		if (!weight.equals("5")) tag.putString("weight", weight);
 
+		if (setupLoot != null) tag.putBoolean("setup_loot", setupLoot);
+
 		ListTag modifiersTag = new ListTag();
 		for (Modifier modifier : modifierList) {
 			modifiersTag.add(modifier.toTag(new CompoundTag()));
@@ -133,6 +138,10 @@ public abstract class PocketGenerator implements Weighted<PocketGenerationParame
 		return this.weightEquation.apply(parameters.toVariableMap(new HashMap<>()));
 	}
 
+	public Boolean getSetupLoot() {
+		return setupLoot;
+	}
+
 	public void applyModifiers(PocketGenerationParameters parameters, RiftManager manager) {
 		for (Modifier modifier : modifierList) {
 			modifier.apply(parameters, manager);
diff --git a/src/main/java/org/dimdev/dimdoors/pockets/virtual/reference/PocketGeneratorReference.java b/src/main/java/org/dimdev/dimdoors/pockets/virtual/reference/PocketGeneratorReference.java
index 62d761cb..047a6132 100644
--- a/src/main/java/org/dimdev/dimdoors/pockets/virtual/reference/PocketGeneratorReference.java
+++ b/src/main/java/org/dimdev/dimdoors/pockets/virtual/reference/PocketGeneratorReference.java
@@ -99,7 +99,7 @@ public abstract class PocketGeneratorReference extends VirtualSingularPocket {
 		generator.applyModifiers(parameters, manager);
 
 		this.applyModifiers(parameters, manager);
-		generator.setup(pocket, parameters, setupLoot != null ? setupLoot : true);
+		generator.setup(pocket, parameters, setupLoot != null ? setupLoot : (generator.getSetupLoot()) != null ? generator.getSetupLoot() : true);
 		return pocket;
 	}