Improve ChangeOwnerListener.

Remove hardcoded AcidIsland and BSkyBlock support and add generic any GameMode support.
BentoBoxWorld · Jun 12, 2019 · 4798954 · 4798954
1 parent b4f396b
commit 4798954
Showing 1 changed file with 14 additions and 16 deletions.
diff --git a/src/main/java/world/bentobox/biomes/listeners/ChangeOwnerListener.java b/src/main/java/world/bentobox/biomes/listeners/ChangeOwnerListener.java
@@ -59,26 +59,24 @@ public void onTeamSetOwnerEvent(TeamSetownerEvent event)
 			defaultBiome = "";
 		}
 
+		// It is assumed that biomes.set permission is required to change biome.
 		if (!hasPermissions)
 		{
-			BiomesObject defaultBiomeObject = this.addon.getAddonManager().getBiomeFromString(defaultBiome);
+			BiomesObject defaultBiomeObject;
 
-			if (!defaultBiome.isEmpty() && defaultBiomeObject == null)
+			Biome biome = BiomesAddonManager.getBiomeNameMap().getOrDefault(defaultBiome.toUpperCase(), null);
+
+			if (biome == null)
+			{
+				this.addon.logError("Biome defined in GameMode addon is not valid!!!");
+				return;
+			}
+			else
 			{
-				Biome biome = BiomesAddonManager.getBiomeNameMap().getOrDefault(defaultBiome.toUpperCase(), null);
-
-				if (biome == null)
-				{
-					this.addon.logError("Biome defined in GameMode addon is not valid!!!");
-					return;
-				}
-				else
-				{
-					defaultBiomeObject = new BiomesObject();
-					defaultBiomeObject.setBiome(biome);
-					defaultBiomeObject.setRequiredCost(0);
-					defaultBiomeObject.setRequiredLevel(0);
-				}
+				defaultBiomeObject = new BiomesObject();
+				defaultBiomeObject.setBiome(biome);
+				defaultBiomeObject.setRequiredCost(0);
+				defaultBiomeObject.setRequiredLevel(0);
 			}
 
 			// Forcefully update biome on whole user island.