Skip to content

Commit 6818cf5

Browse files
author
MagmaGuy
committed
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>
1 parent 8846907 commit 6818cf5

File tree

6 files changed

+71
-4
lines changed

6 files changed

+71
-4
lines changed

build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ processResources {
2323
}
2424

2525
group 'com.magmaguy'
26-
version '8.7.15-SNAPSHOT'
26+
version '8.7.16-SNAPSHOT'
2727

2828
repositories {
2929
maven {
@@ -126,7 +126,7 @@ dependencies {
126126
compileOnly group: 'com.magmaguy', name: 'FreeMinecraftModels', version: '1.3.0-SNAPSHOT'
127127

128128
//Advanced AI goals
129-
implementation group: 'com.magmaguy', name: 'EasyMinecraftGoals-dist', version: '1.11.1-SNAPSHOT'
129+
implementation group: 'com.magmaguy', name: 'EasyMinecraftGoals-dist', version: '1.11.2-SNAPSHOT'
130130

131131
// Mythic Mobs integration - currently only for arenas
132132
compileOnly group: 'io.lumine', name: 'Mythic-Dist', version: '5.3.5'

src/main/java/com/magmaguy/elitemobs/adventurersguild/GuildRank.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -105,6 +105,7 @@ public static String getRankName(int prestige, int rank) {
105105

106106
public static void setMaxHealth(Player player, int activeGuildRank, int prestigeRank) {
107107
if (!AdventurersGuildConfig.isAddMaxHealth()) return;
108+
if (AdventurersGuildConfig.getWorldsWithoutAGBonuses().contains(player.getWorld().getName())) return;
108109
double guildRankBonus = healthBonusValue(prestigeRank, activeGuildRank);
109110
double newMaxHealth = 20 + guildRankBonus;
110111
player.getAttribute(Attribute.GENERIC_MAX_HEALTH).setBaseValue(newMaxHealth);
Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,37 @@
1+
package com.magmaguy.elitemobs.config.dungeonpackager.premade;
2+
3+
import com.magmaguy.elitemobs.config.dungeonpackager.DungeonPackagerConfigFields;
4+
import com.magmaguy.elitemobs.utils.DiscordLinks;
5+
import org.bukkit.World;
6+
7+
import java.util.Arrays;
8+
import java.util.List;
9+
import java.util.Map;
10+
11+
public class TheNetherWastes extends DungeonPackagerConfigFields {
12+
public TheNetherWastes(){
13+
super("the_nether_wastes_dungeon",
14+
false,
15+
"&2[lvl 050] &3The Nether Wastes Dungeon",
16+
Arrays.asList("&fAn unexplored part of the Nether.",
17+
"&6Credits: MagmaGuy, Frostcone, Dali_"),
18+
DiscordLinks.freeMinidungeons,
19+
DungeonSizeCategory.DUNGEON,
20+
"em_id_the_nether_wastes",
21+
World.Environment.NORMAL,
22+
true,
23+
"em_id_the_nether_wastes,38.5,84,64.5,-155,0",
24+
"em_id_the_nether_wastes,41.5,82.5,55.5,-167,0",
25+
0,
26+
"Difficulty: &45-man hard content!",
27+
"&bTraverse the wastes and see what you can find.",
28+
"&bYou have left The Nether Wastes!",
29+
List.of("filename=em_id_the_nether_wastes_miniboss_5_shroud_p1.yml"),
30+
"em_id_the_nether_wastes",
31+
50);
32+
setDifficulties(List.of(
33+
Map.of("name", "normal", "levelSync", 52, "id", 0),
34+
Map.of("name", "hard", "levelSync", 50, "id", 1),
35+
Map.of("name", "mythic", "levelSync", 48, "id", 2)));
36+
}
37+
}
Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
package com.magmaguy.elitemobs.config.npcs.premade;
2+
3+
import com.magmaguy.elitemobs.config.npcs.NPCsConfigFields;
4+
import com.magmaguy.elitemobs.npcs.NPCInteractions;
5+
import org.bukkit.entity.Villager;
6+
7+
import java.util.List;
8+
9+
public class TheNetherWastesTeleporter extends NPCsConfigFields {
10+
public TheNetherWastesTeleporter(){
11+
super("the_nether_wastes_teleporter",
12+
true,
13+
"Nether Shroom",
14+
"<[50] The Nether Wastes Teleporter>",
15+
Villager.Profession.ARMORER,
16+
"em_adventurers_guild,295.5,78.18,198.5,180,0",
17+
List.of(""),
18+
List.of(),
19+
List.of(),
20+
true,
21+
1,
22+
NPCInteractions.NPCInteractionType.COMMAND);
23+
setCommand("em dungeontp the_nether_wastes_dungeon.yml");
24+
setDisguise("custom:elitemobs_the_nether_wastes_teleporter");
25+
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}");
26+
}
27+
}

src/main/java/com/magmaguy/elitemobs/items/customitems/CustomItem.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -325,7 +325,9 @@ public ItemStack generateDefaultsItemStack(Player player, boolean showItemWorth,
325325

326326
public ItemStack generateItemStack(int itemTier, Player player, EliteEntity eliteEntity) {
327327
ItemStack itemStack = null;
328-
itemTier = limitItemLevel(player, itemTier);
328+
//This can happen when doing drop tables, the loot is not yet assigned to anyone
329+
if (player != null)
330+
itemTier = limitItemLevel(player, itemTier);
329331
switch (this.scalability) {
330332
case FIXED:
331333
itemStack = generateDefaultsItemStack(player, false, eliteEntity);

src/main/resources/plugin.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
name: EliteMobs
2-
version: 8.7.15
2+
version: 8.7.16
33
author: MagmaGuy
44
main: com.magmaguy.elitemobs.EliteMobs
55
api-version: 1.14

0 commit comments

Comments
 (0)