EliteMobs 8.7.16

- [New] Added the new story-mode dungeon, The Nether Wastes - [Fix] Fixed bug that caused the guild bonus blacklister to not work on login - [Fix] Fixed bug where loot would not drop and console would error when killing a boss in an instanced dungeon - [Update] Updated EasyMinecraftGoals version Signed-off-by: MagmaGuy <tiagoarnaut@gmail.com>
MagmaGuy · Jun 17, 2024 · 6818cf5 · 6818cf5
1 parent 8846907
commit 6818cf5
Show file tree

Hide file tree

Showing 6 changed files with 71 additions and 4 deletions.
diff --git a/build.gradle b/build.gradle
@@ -23,7 +23,7 @@ processResources {
 }
 
 group 'com.magmaguy'
-version '8.7.15-SNAPSHOT'
+version '8.7.16-SNAPSHOT'
 
 repositories {
     maven {
@@ -126,7 +126,7 @@ dependencies {
     compileOnly group: 'com.magmaguy', name: 'FreeMinecraftModels', version: '1.3.0-SNAPSHOT'
 
     //Advanced AI goals
-    implementation group: 'com.magmaguy', name: 'EasyMinecraftGoals-dist', version: '1.11.1-SNAPSHOT'
+    implementation group: 'com.magmaguy', name: 'EasyMinecraftGoals-dist', version: '1.11.2-SNAPSHOT'
 
     // Mythic Mobs integration - currently only for arenas
     compileOnly group: 'io.lumine', name: 'Mythic-Dist', version: '5.3.5'

diff --git a/src/main/java/com/magmaguy/elitemobs/adventurersguild/GuildRank.java b/src/main/java/com/magmaguy/elitemobs/adventurersguild/GuildRank.java
@@ -105,6 +105,7 @@ public static String getRankName(int prestige, int rank) {
 
     public static void setMaxHealth(Player player, int activeGuildRank, int prestigeRank) {
         if (!AdventurersGuildConfig.isAddMaxHealth()) return;
+        if (AdventurersGuildConfig.getWorldsWithoutAGBonuses().contains(player.getWorld().getName())) return;
         double guildRankBonus = healthBonusValue(prestigeRank, activeGuildRank);
         double newMaxHealth = 20 + guildRankBonus;
         player.getAttribute(Attribute.GENERIC_MAX_HEALTH).setBaseValue(newMaxHealth);

diff --git a/src/main/java/com/magmaguy/elitemobs/config/dungeonpackager/premade/TheNetherWastes.java b/src/main/java/com/magmaguy/elitemobs/config/dungeonpackager/premade/TheNetherWastes.java
@@ -0,0 +1,37 @@
+package com.magmaguy.elitemobs.config.dungeonpackager.premade;
+
+import com.magmaguy.elitemobs.config.dungeonpackager.DungeonPackagerConfigFields;
+import com.magmaguy.elitemobs.utils.DiscordLinks;
+import org.bukkit.World;
+
+import java.util.Arrays;
+import java.util.List;
+import java.util.Map;
+
+public class TheNetherWastes extends DungeonPackagerConfigFields {
+    public TheNetherWastes(){
+        super("the_nether_wastes_dungeon",
+                false,
+                "&2[lvl 050] &3The Nether Wastes Dungeon",
+                Arrays.asList("&fAn unexplored part of the Nether.",
+                        "&6Credits: MagmaGuy, Frostcone, Dali_"),
+                DiscordLinks.freeMinidungeons,
+                DungeonSizeCategory.DUNGEON,
+                "em_id_the_nether_wastes",
+                World.Environment.NORMAL,
+                true,
+                "em_id_the_nether_wastes,38.5,84,64.5,-155,0",
+                "em_id_the_nether_wastes,41.5,82.5,55.5,-167,0",
+                0,
+                "Difficulty: &45-man hard content!",
+                "&bTraverse the wastes and see what you can find.",
+                "&bYou have left The Nether Wastes!",
+                List.of("filename=em_id_the_nether_wastes_miniboss_5_shroud_p1.yml"),
+                "em_id_the_nether_wastes",
+                50);
+        setDifficulties(List.of(
+                Map.of("name", "normal", "levelSync", 52, "id", 0),
+                Map.of("name", "hard", "levelSync", 50, "id", 1),
+                Map.of("name", "mythic", "levelSync", 48, "id", 2)));
+    }
+}
diff --git a/src/main/java/com/magmaguy/elitemobs/config/npcs/premade/TheNetherWastesTeleporter.java b/src/main/java/com/magmaguy/elitemobs/config/npcs/premade/TheNetherWastesTeleporter.java
@@ -0,0 +1,27 @@
+package com.magmaguy.elitemobs.config.npcs.premade;
+
+import com.magmaguy.elitemobs.config.npcs.NPCsConfigFields;
+import com.magmaguy.elitemobs.npcs.NPCInteractions;
+import org.bukkit.entity.Villager;
+
+import java.util.List;
+
+public class TheNetherWastesTeleporter extends NPCsConfigFields {
+    public TheNetherWastesTeleporter(){
+        super("the_nether_wastes_teleporter",
+                true,
+                "Nether Shroom",
+                "<[50] The Nether Wastes Teleporter>",
+                Villager.Profession.ARMORER,
+                "em_adventurers_guild,295.5,78.18,198.5,180,0",
+                List.of(""),
+                List.of(),
+                List.of(),
+                true,
+                1,
+                NPCInteractions.NPCInteractionType.COMMAND);
+        setCommand("em dungeontp the_nether_wastes_dungeon.yml");
+        setDisguise("custom:elitemobs_the_nether_wastes_teleporter");
+        setCustomDisguiseData("player elitemobs_the_nether_wastes_teleporter setskin {\"id\":\"ebc6f487-4973-4941-9f41-30f957de3a00\",\"name\":\"Unknown\",\"properties\":[{\"name\":\"textures\",\"value\":\"ewogICJ0aW1lc3RhbXAiIDogMTY4OTI2NjE1MjExMSwKICAicHJvZmlsZUlkIiA6ICJlOWRlMDE0NjExZDI0NGY5OTVjNmNiMjhkMDk5MWExNSIsCiAgInByb2ZpbGVOYW1lIiA6ICJFbGl6YWJldGhUcnVzcyIsCiAgInNpZ25hdHVyZVJlcXVpcmVkIiA6IHRydWUsCiAgInRleHR1cmVzIiA6IHsKICAgICJTS0lOIiA6IHsKICAgICAgInVybCIgOiAiaHR0cDovL3RleHR1cmVzLm1pbmVjcmFmdC5uZXQvdGV4dHVyZS80MzZhYzQzNzhjOTlhMGIxYWQ1NjcyNjE4ODIxMGZhNGU2ZDI4YTRhYjk1MWQzYmFlZTM1OTEyNjcwNTI3MGM1IgogICAgfQogIH0KfQ==\",\"signature\":\"Z057s/MMryjQI0zTUrZDMCSS9+U1pnfY4Gfy1hdZPYBbuZlhOIAxIIRUoeP5fvRBOA6OlOuqsWvH1ihDNhX/KSAmJzIaaCyuCG4yb6ps63v/3mzdO4oJLR2pzB8iOMOBIsBRaEhf6CDhko2C3Moz5SC6Evn9AClt0E8NCXiINOciGU8i8tMM7JYk3JTswW2KWoBC05AO4c6I/FptYIoASpFZuy9Ie3CefRmTNsFfrSXhocWMNiYici9CB6iyz2Fm491U0imJpqx2i20iCuk8J9VbrGpu94i7sbzkZwCl7983RSa+u5k36q3TNmEg03xUlqoB4icOWN+kQc50MJs81IYnvnLqGwLYukiTExPlJ+CmoUE6bLIOQV8g/P8O1OecLw4IXQx9pSKdoUwb/eNNUsQ8Uk7yHtkgCBKN8CCLbN+s5hZ84+zLa1T5ITnrDfm3BBpjJ5yOFq6pK3WF7YuyOfwxrzs69vi/AMTQ68t8UVWzjHOG2nzQKIA3mlSbZ1RIpy5RgpGM3axwzJeTo1rLP4YGewf6XHStPeQkehotbUKcIzuq4hbdMHAZfpcCq0he7oXw6T5ulA4by9cDCLOgQZpZfDZdI4rvgZUkN12jH0WmrfHGqde2qRcoGS4u3tlw3YCXXQCa3UuhGEtkdCDBYQSbhs2i5DTcm7zaTGp38Bg=\"}],\"legacy\":false}");
+    }
+}
diff --git a/src/main/java/com/magmaguy/elitemobs/items/customitems/CustomItem.java b/src/main/java/com/magmaguy/elitemobs/items/customitems/CustomItem.java
@@ -325,7 +325,9 @@ public ItemStack generateDefaultsItemStack(Player player, boolean showItemWorth,
 
     public ItemStack generateItemStack(int itemTier, Player player, EliteEntity eliteEntity) {
         ItemStack itemStack = null;
-        itemTier = limitItemLevel(player, itemTier);
+        //This can happen when doing drop tables, the loot is not yet assigned to anyone
+        if (player != null)
+            itemTier = limitItemLevel(player, itemTier);
         switch (this.scalability) {
             case FIXED:
                 itemStack = generateDefaultsItemStack(player, false, eliteEntity);

diff --git a/src/main/resources/plugin.yml b/src/main/resources/plugin.yml
@@ -1,5 +1,5 @@
 name: EliteMobs
-version: 8.7.15
+version: 8.7.16
 author: MagmaGuy
 main: com.magmaguy.elitemobs.EliteMobs
 api-version: 1.14