From e1b05af2dfe573e650ab1918ed7a2a1664128c9b Mon Sep 17 00:00:00 2001 From: Brianna Date: Sat, 19 Oct 2019 15:46:28 -0400 Subject: [PATCH 1/6] Fixed command syntax issue. --- .../epicbosses/commands/CommandBoss.java | 54 ------------------- .../epicbosses/commands/CommandCreate.java | 2 +- .../epicbosses/commands/CommandDebug.java | 2 +- .../epicbosses/commands/CommandDropTable.java | 2 +- .../epicbosses/commands/CommandEdit.java | 2 +- .../epicbosses/commands/CommandGiveEgg.java | 2 +- .../epicbosses/commands/CommandInfo.java | 2 +- .../epicbosses/commands/CommandItems.java | 2 +- .../epicbosses/commands/CommandKillAll.java | 2 +- .../epicbosses/commands/CommandList.java | 2 +- .../epicbosses/commands/CommandMenu.java | 2 +- .../epicbosses/commands/CommandNearby.java | 2 +- .../commands/CommandNewAutoSpawn.java | 2 +- .../commands/CommandNewCommand.java | 2 +- .../commands/CommandNewDropTable.java | 2 +- .../commands/CommandNewMessage.java | 2 +- .../epicbosses/commands/CommandNewSkill.java | 2 +- .../epicbosses/commands/CommandReload.java | 2 +- .../epicbosses/commands/CommandShop.java | 2 +- .../epicbosses/commands/CommandSkills.java | 2 +- .../epicbosses/commands/CommandSpawn.java | 2 +- .../epicbosses/commands/CommandTime.java | 2 +- 22 files changed, 21 insertions(+), 75 deletions(-) delete mode 100644 plugin-modules/Core/src/com/songoda/epicbosses/commands/CommandBoss.java diff --git a/plugin-modules/Core/src/com/songoda/epicbosses/commands/CommandBoss.java b/plugin-modules/Core/src/com/songoda/epicbosses/commands/CommandBoss.java deleted file mode 100644 index c96c520..0000000 --- a/plugin-modules/Core/src/com/songoda/epicbosses/commands/CommandBoss.java +++ /dev/null @@ -1,54 +0,0 @@ -package com.songoda.epicbosses.commands; - -import com.songoda.core.commands.AbstractCommand; -import com.songoda.core.utils.TextUtils; -import com.songoda.epicbosses.EpicBosses; -import org.bukkit.command.CommandSender; - -import java.util.List; - -public class CommandBoss extends AbstractCommand { - - EpicBosses instance; - - public CommandBoss() { - super(false, "Boss"); - instance = EpicBosses.getInstance(); - } - - @Override - protected ReturnType runCommand(CommandSender sender, String... args) { - sender.sendMessage(""); - sender.sendMessage(TextUtils.formatText("&b&lEpicBosses &8» &7Version " + instance.getDescription().getVersion() - + " Created with <3 by &5&l&oSongoda")); - - for (AbstractCommand command : instance.getCommandManager().getAllCommands()) { - if (command.getPermissionNode() == null || sender.hasPermission(command.getPermissionNode())) { - sender.sendMessage(TextUtils.formatText("&8 - &a" + command.getSyntax() + "&7 - " + command.getDescription())); - } - } - sender.sendMessage(""); - - return ReturnType.SUCCESS; - } - - @Override - protected List onTab(CommandSender cs, String... args) { - return null; - } - - @Override - public String getPermissionNode() { - return null; - } - - @Override - public String getSyntax() { - return "/boss"; - } - - @Override - public String getDescription() { - return "Displays this page."; - } -} diff --git a/plugin-modules/Core/src/com/songoda/epicbosses/commands/CommandCreate.java b/plugin-modules/Core/src/com/songoda/epicbosses/commands/CommandCreate.java index 3a4fc8f..df85405 100644 --- a/plugin-modules/Core/src/com/songoda/epicbosses/commands/CommandCreate.java +++ b/plugin-modules/Core/src/com/songoda/epicbosses/commands/CommandCreate.java @@ -88,7 +88,7 @@ public class CommandCreate extends AbstractCommand { @Override public String getSyntax() { - return "/boss create <[>name> "; + return "create <[>name> "; } @Override diff --git a/plugin-modules/Core/src/com/songoda/epicbosses/commands/CommandDebug.java b/plugin-modules/Core/src/com/songoda/epicbosses/commands/CommandDebug.java index c2241cd..719061f 100644 --- a/plugin-modules/Core/src/com/songoda/epicbosses/commands/CommandDebug.java +++ b/plugin-modules/Core/src/com/songoda/epicbosses/commands/CommandDebug.java @@ -52,7 +52,7 @@ public class CommandDebug extends AbstractCommand { @Override public String getSyntax() { - return "/boss reload"; + return "reload"; } @Override diff --git a/plugin-modules/Core/src/com/songoda/epicbosses/commands/CommandDropTable.java b/plugin-modules/Core/src/com/songoda/epicbosses/commands/CommandDropTable.java index e21e16d..88091b7 100644 --- a/plugin-modules/Core/src/com/songoda/epicbosses/commands/CommandDropTable.java +++ b/plugin-modules/Core/src/com/songoda/epicbosses/commands/CommandDropTable.java @@ -40,7 +40,7 @@ public class CommandDropTable extends AbstractCommand { @Override public String getSyntax() { - return "/boss droptable"; + return "droptable"; } @Override diff --git a/plugin-modules/Core/src/com/songoda/epicbosses/commands/CommandEdit.java b/plugin-modules/Core/src/com/songoda/epicbosses/commands/CommandEdit.java index 297b89f..c9966cd 100644 --- a/plugin-modules/Core/src/com/songoda/epicbosses/commands/CommandEdit.java +++ b/plugin-modules/Core/src/com/songoda/epicbosses/commands/CommandEdit.java @@ -71,7 +71,7 @@ public class CommandEdit extends AbstractCommand { @Override public String getSyntax() { - return "/boss edit "; + return "edit "; } @Override diff --git a/plugin-modules/Core/src/com/songoda/epicbosses/commands/CommandGiveEgg.java b/plugin-modules/Core/src/com/songoda/epicbosses/commands/CommandGiveEgg.java index f50a6d0..b38fd62 100644 --- a/plugin-modules/Core/src/com/songoda/epicbosses/commands/CommandGiveEgg.java +++ b/plugin-modules/Core/src/com/songoda/epicbosses/commands/CommandGiveEgg.java @@ -105,7 +105,7 @@ public class CommandGiveEgg extends AbstractCommand { @Override public String getSyntax() { - return "/boss giveegg [amount]"; + return "giveegg [amount]"; } @Override diff --git a/plugin-modules/Core/src/com/songoda/epicbosses/commands/CommandInfo.java b/plugin-modules/Core/src/com/songoda/epicbosses/commands/CommandInfo.java index e42e396..0b3755d 100644 --- a/plugin-modules/Core/src/com/songoda/epicbosses/commands/CommandInfo.java +++ b/plugin-modules/Core/src/com/songoda/epicbosses/commands/CommandInfo.java @@ -64,7 +64,7 @@ public class CommandInfo extends AbstractCommand { @Override public String getSyntax() { - return "/boss info "; + return "info "; } @Override diff --git a/plugin-modules/Core/src/com/songoda/epicbosses/commands/CommandItems.java b/plugin-modules/Core/src/com/songoda/epicbosses/commands/CommandItems.java index f82a1d5..0fa0353 100644 --- a/plugin-modules/Core/src/com/songoda/epicbosses/commands/CommandItems.java +++ b/plugin-modules/Core/src/com/songoda/epicbosses/commands/CommandItems.java @@ -39,7 +39,7 @@ public class CommandItems extends AbstractCommand { @Override public String getSyntax() { - return "/boss items"; + return "items"; } @Override diff --git a/plugin-modules/Core/src/com/songoda/epicbosses/commands/CommandKillAll.java b/plugin-modules/Core/src/com/songoda/epicbosses/commands/CommandKillAll.java index 150d501..1261495 100644 --- a/plugin-modules/Core/src/com/songoda/epicbosses/commands/CommandKillAll.java +++ b/plugin-modules/Core/src/com/songoda/epicbosses/commands/CommandKillAll.java @@ -61,7 +61,7 @@ public class CommandKillAll extends AbstractCommand { @Override public String getSyntax() { - return "/boss killall [world]"; + return "killall [world]"; } @Override diff --git a/plugin-modules/Core/src/com/songoda/epicbosses/commands/CommandList.java b/plugin-modules/Core/src/com/songoda/epicbosses/commands/CommandList.java index 4ab1a00..2c81c89 100644 --- a/plugin-modules/Core/src/com/songoda/epicbosses/commands/CommandList.java +++ b/plugin-modules/Core/src/com/songoda/epicbosses/commands/CommandList.java @@ -39,7 +39,7 @@ public class CommandList extends AbstractCommand { @Override public String getSyntax() { - return "/boss list"; + return "list"; } @Override diff --git a/plugin-modules/Core/src/com/songoda/epicbosses/commands/CommandMenu.java b/plugin-modules/Core/src/com/songoda/epicbosses/commands/CommandMenu.java index 9da9e8f..cb02167 100644 --- a/plugin-modules/Core/src/com/songoda/epicbosses/commands/CommandMenu.java +++ b/plugin-modules/Core/src/com/songoda/epicbosses/commands/CommandMenu.java @@ -34,7 +34,7 @@ public class CommandMenu extends AbstractCommand { @Override public String getPermissionNode() { - return "/boss menu"; + return "menu"; } @Override diff --git a/plugin-modules/Core/src/com/songoda/epicbosses/commands/CommandNearby.java b/plugin-modules/Core/src/com/songoda/epicbosses/commands/CommandNearby.java index c36ee5f..f53eb54 100644 --- a/plugin-modules/Core/src/com/songoda/epicbosses/commands/CommandNearby.java +++ b/plugin-modules/Core/src/com/songoda/epicbosses/commands/CommandNearby.java @@ -81,7 +81,7 @@ public class CommandNearby extends AbstractCommand { @Override public String getSyntax() { - return "/boss nearby [radius]"; + return "nearby [radius]"; } @Override diff --git a/plugin-modules/Core/src/com/songoda/epicbosses/commands/CommandNewAutoSpawn.java b/plugin-modules/Core/src/com/songoda/epicbosses/commands/CommandNewAutoSpawn.java index 3c54541..63a0486 100644 --- a/plugin-modules/Core/src/com/songoda/epicbosses/commands/CommandNewAutoSpawn.java +++ b/plugin-modules/Core/src/com/songoda/epicbosses/commands/CommandNewAutoSpawn.java @@ -60,7 +60,7 @@ public class CommandNewAutoSpawn extends AbstractCommand { @Override public String getSyntax() { - return "/boss new autospawn "; + return "new autospawn "; } @Override diff --git a/plugin-modules/Core/src/com/songoda/epicbosses/commands/CommandNewCommand.java b/plugin-modules/Core/src/com/songoda/epicbosses/commands/CommandNewCommand.java index cfd2ce9..f3d2655 100644 --- a/plugin-modules/Core/src/com/songoda/epicbosses/commands/CommandNewCommand.java +++ b/plugin-modules/Core/src/com/songoda/epicbosses/commands/CommandNewCommand.java @@ -54,7 +54,7 @@ public class CommandNewCommand extends AbstractCommand { @Override public String getSyntax() { - return "/boss new command "; + return "new command "; } @Override diff --git a/plugin-modules/Core/src/com/songoda/epicbosses/commands/CommandNewDropTable.java b/plugin-modules/Core/src/com/songoda/epicbosses/commands/CommandNewDropTable.java index bd9be00..149847a 100644 --- a/plugin-modules/Core/src/com/songoda/epicbosses/commands/CommandNewDropTable.java +++ b/plugin-modules/Core/src/com/songoda/epicbosses/commands/CommandNewDropTable.java @@ -80,7 +80,7 @@ public class CommandNewDropTable extends AbstractCommand { @Override public String getSyntax() { - return "/boss new droptable "; + return "new droptable "; } @Override diff --git a/plugin-modules/Core/src/com/songoda/epicbosses/commands/CommandNewMessage.java b/plugin-modules/Core/src/com/songoda/epicbosses/commands/CommandNewMessage.java index 51e3add..76068c1 100644 --- a/plugin-modules/Core/src/com/songoda/epicbosses/commands/CommandNewMessage.java +++ b/plugin-modules/Core/src/com/songoda/epicbosses/commands/CommandNewMessage.java @@ -58,7 +58,7 @@ public class CommandNewMessage extends AbstractCommand { @Override public String getSyntax() { - return "/boss new message "; + return "new message "; } @Override diff --git a/plugin-modules/Core/src/com/songoda/epicbosses/commands/CommandNewSkill.java b/plugin-modules/Core/src/com/songoda/epicbosses/commands/CommandNewSkill.java index 5ea1339..14cb02d 100644 --- a/plugin-modules/Core/src/com/songoda/epicbosses/commands/CommandNewSkill.java +++ b/plugin-modules/Core/src/com/songoda/epicbosses/commands/CommandNewSkill.java @@ -94,7 +94,7 @@ public class CommandNewSkill extends AbstractCommand { @Override public String getSyntax() { - return "/boss new skill "; + return "new skill "; } @Override diff --git a/plugin-modules/Core/src/com/songoda/epicbosses/commands/CommandReload.java b/plugin-modules/Core/src/com/songoda/epicbosses/commands/CommandReload.java index 16c3c47..06393b7 100644 --- a/plugin-modules/Core/src/com/songoda/epicbosses/commands/CommandReload.java +++ b/plugin-modules/Core/src/com/songoda/epicbosses/commands/CommandReload.java @@ -47,7 +47,7 @@ public class CommandReload extends AbstractCommand { @Override public String getSyntax() { - return "/boss reload"; + return "reload"; } @Override diff --git a/plugin-modules/Core/src/com/songoda/epicbosses/commands/CommandShop.java b/plugin-modules/Core/src/com/songoda/epicbosses/commands/CommandShop.java index 12e3247..fd79b30 100644 --- a/plugin-modules/Core/src/com/songoda/epicbosses/commands/CommandShop.java +++ b/plugin-modules/Core/src/com/songoda/epicbosses/commands/CommandShop.java @@ -46,7 +46,7 @@ public class CommandShop extends AbstractCommand { @Override public String getSyntax() { - return "/boss shop"; + return "shop"; } @Override diff --git a/plugin-modules/Core/src/com/songoda/epicbosses/commands/CommandSkills.java b/plugin-modules/Core/src/com/songoda/epicbosses/commands/CommandSkills.java index ad4fd90..3bc1eeb 100644 --- a/plugin-modules/Core/src/com/songoda/epicbosses/commands/CommandSkills.java +++ b/plugin-modules/Core/src/com/songoda/epicbosses/commands/CommandSkills.java @@ -39,7 +39,7 @@ public class CommandSkills extends AbstractCommand { @Override public String getSyntax() { - return "/boss skills"; + return "skills"; } @Override diff --git a/plugin-modules/Core/src/com/songoda/epicbosses/commands/CommandSpawn.java b/plugin-modules/Core/src/com/songoda/epicbosses/commands/CommandSpawn.java index 89ef65b..58c48ab 100644 --- a/plugin-modules/Core/src/com/songoda/epicbosses/commands/CommandSpawn.java +++ b/plugin-modules/Core/src/com/songoda/epicbosses/commands/CommandSpawn.java @@ -84,7 +84,7 @@ public class CommandSpawn extends AbstractCommand { @Override public String getSyntax() { - return "/boss spawn [location]"; + return "spawn [location]"; } @Override diff --git a/plugin-modules/Core/src/com/songoda/epicbosses/commands/CommandTime.java b/plugin-modules/Core/src/com/songoda/epicbosses/commands/CommandTime.java index 3b3c422..e06d0ea 100644 --- a/plugin-modules/Core/src/com/songoda/epicbosses/commands/CommandTime.java +++ b/plugin-modules/Core/src/com/songoda/epicbosses/commands/CommandTime.java @@ -82,7 +82,7 @@ public class CommandTime extends AbstractCommand { @Override public String getSyntax() { - return "/boss time
"; + return "time
"; } @Override From 0aca79652f2a6cc2d9344e325a63c21cc2e7c797 Mon Sep 17 00:00:00 2001 From: Brianna Date: Sat, 19 Oct 2019 16:09:36 -0400 Subject: [PATCH 2/6] Added vault and playerpoints as soft depends. --- plugin-modules/Core/resources-yml/plugin.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugin-modules/Core/resources-yml/plugin.yml b/plugin-modules/Core/resources-yml/plugin.yml index e6c1233..f9889fa 100644 --- a/plugin-modules/Core/resources-yml/plugin.yml +++ b/plugin-modules/Core/resources-yml/plugin.yml @@ -3,7 +3,7 @@ main: ${plugin.main} version: ${plugin.version} author: ${plugin.author} api-version: 1.13 -softdepend: [PlaceholderAPI] # TODO: Add other softdepends +softdepend: [PlaceholderAPI, PlayerPoints, Vault] # TODO: Add other softdepends commands: Boss: description: Used to handle all CustomBosses related commands. From 2a6a2f51187bf6becdc714b403272377decc6dd0 Mon Sep 17 00:00:00 2001 From: Brianna Date: Sat, 19 Oct 2019 17:24:57 -0400 Subject: [PATCH 3/6] Added option to prevent bosses from exploding. --- .../listeners/during/BossDamageListener.java | 13 +++++++++++++ .../com/songoda/epicbosses/settings/Settings.java | 3 +++ 2 files changed, 16 insertions(+) diff --git a/plugin-modules/Core/src/com/songoda/epicbosses/listeners/during/BossDamageListener.java b/plugin-modules/Core/src/com/songoda/epicbosses/listeners/during/BossDamageListener.java index 9d46427..d0d299c 100644 --- a/plugin-modules/Core/src/com/songoda/epicbosses/listeners/during/BossDamageListener.java +++ b/plugin-modules/Core/src/com/songoda/epicbosses/listeners/during/BossDamageListener.java @@ -7,12 +7,16 @@ import com.songoda.epicbosses.events.BossDamageEvent; import com.songoda.epicbosses.holder.ActiveBossHolder; import com.songoda.epicbosses.managers.BossEntityManager; import com.songoda.epicbosses.managers.files.BossesFileManager; +import com.songoda.epicbosses.settings.Settings; import com.songoda.epicbosses.utils.ServerUtils; import org.bukkit.entity.*; import org.bukkit.event.EventHandler; import org.bukkit.event.EventPriority; import org.bukkit.event.Listener; +import org.bukkit.event.entity.EntityCombustEvent; import org.bukkit.event.entity.EntityDamageByEntityEvent; +import org.bukkit.event.entity.EntityExplodeEvent; +import org.bukkit.event.entity.ExplosionPrimeEvent; /** * @author Charles Cullen @@ -85,4 +89,13 @@ public class BossDamageListener implements Listener { activeBossHolder.getMapOfDamagingUsers().put(player.getUniqueId(), currentDamage + damage); } + @EventHandler(priority = EventPriority.HIGHEST) + public void onBossExplode(ExplosionPrimeEvent event) { + if (!(event.getEntity() instanceof LivingEntity)) return; + LivingEntity livingEntity = (LivingEntity) event.getEntity(); + ActiveBossHolder activeBossHolder = this.bossEntityManager.getActiveBossHolder(livingEntity); + + if (activeBossHolder != null && !Settings.BOSS_EXPLOSIONS.getBoolean()) + event.setCancelled(true); + } } diff --git a/plugin-modules/Core/src/com/songoda/epicbosses/settings/Settings.java b/plugin-modules/Core/src/com/songoda/epicbosses/settings/Settings.java index 62d8319..c6e61cc 100644 --- a/plugin-modules/Core/src/com/songoda/epicbosses/settings/Settings.java +++ b/plugin-modules/Core/src/com/songoda/epicbosses/settings/Settings.java @@ -28,6 +28,9 @@ public class Settings { "Which economy plugin should be used?", "Supported plugins you have installed: \"" + EconomyManager.getManager().getRegisteredPlugins().stream().collect(Collectors.joining("\", \"")) + "\"."); + public static final ConfigSetting BOSS_EXPLOSIONS = new ConfigSetting(config, "Toggles.bossExplosions", false, + "Should bosses such as Creepers be allowed to explode?"); + public static final ConfigSetting BOSS_SHOP = new ConfigSetting(config, "Toggles.bossShop", true); public static final ConfigSetting ENDERMAN_TELEPORTING = new ConfigSetting(config, "Toggles.endermanTeleporting", true); From 10b37f8867f40495f1ffd531ab012423f9e492e6 Mon Sep 17 00:00:00 2001 From: Brianna Date: Tue, 22 Oct 2019 10:05:09 -0400 Subject: [PATCH 4/6] Added a message informing the user that a boss is in editing mode. --- .../src/com/songoda/epicbosses/commands/CommandSpawn.java | 7 +++++-- .../Core/src/com/songoda/epicbosses/utils/Message.java | 1 + 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/plugin-modules/Core/src/com/songoda/epicbosses/commands/CommandSpawn.java b/plugin-modules/Core/src/com/songoda/epicbosses/commands/CommandSpawn.java index 58c48ab..3ac0a56 100644 --- a/plugin-modules/Core/src/com/songoda/epicbosses/commands/CommandSpawn.java +++ b/plugin-modules/Core/src/com/songoda/epicbosses/commands/CommandSpawn.java @@ -62,8 +62,11 @@ public class CommandSpawn extends AbstractCommand { return ReturnType.FAILURE; } - BossAPI.spawnNewBoss(bossEntity, spawnLocation, null, null, false); - Message.Boss_Spawn_Spawned.msg(sender, bossInput, StringUtils.get().translateLocation(spawnLocation)); + if (BossAPI.spawnNewBoss(bossEntity, spawnLocation, null, null, false) != null) + Message.Boss_Spawn_Spawned.msg(sender, bossInput, StringUtils.get().translateLocation(spawnLocation)); + else + Message.Boss_Spawn_Editing.msg(sender); + return ReturnType.SUCCESS; } diff --git a/plugin-modules/Core/src/com/songoda/epicbosses/utils/Message.java b/plugin-modules/Core/src/com/songoda/epicbosses/utils/Message.java index 9275a71..d2850ba 100644 --- a/plugin-modules/Core/src/com/songoda/epicbosses/utils/Message.java +++ b/plugin-modules/Core/src/com/songoda/epicbosses/utils/Message.java @@ -134,6 +134,7 @@ public enum Message { Boss_Spawn_MustBePlayer("&c&l(!) &cTo use this command without an input of location you must be a player."), Boss_Spawn_InvalidBoss("&c&l(!) &cThe specified boss is not a valid type."), Boss_Spawn_Spawned("&c&l(!) &cYou have spawned a {0} boss at {1}."), + Boss_Spawn_Editing("&c&l(!) &cYou must disable editing for this boss before spawning it."), Boss_Statistics_SetChance("&b&lEpicBosses &8» &7You have {0} the health of the entity to &f{1}&7."), Boss_Statistics_SetDisplayName("&b&lEpicBosses &8» &7Your next input in to chat will be the display name for the entity. If you enter &f-&7 it will remove/clear the display name of the entity. For color codes use the &f& &7sign."), From 2f64dc55af862c1ddd705c977258e3e0fca44cbd Mon Sep 17 00:00:00 2001 From: Brianna Date: Tue, 22 Oct 2019 11:51:01 -0400 Subject: [PATCH 5/6] Fixed an issue with spawning bosses in water on 1.8 --- .../epicbosses/listeners/pre/BossSpawnListener.java | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/plugin-modules/Core/src/com/songoda/epicbosses/listeners/pre/BossSpawnListener.java b/plugin-modules/Core/src/com/songoda/epicbosses/listeners/pre/BossSpawnListener.java index 57e7063..3b5c0ea 100644 --- a/plugin-modules/Core/src/com/songoda/epicbosses/listeners/pre/BossSpawnListener.java +++ b/plugin-modules/Core/src/com/songoda/epicbosses/listeners/pre/BossSpawnListener.java @@ -53,8 +53,6 @@ public class BossSpawnListener implements Listener { Action action = event.getAction(); if (!event.hasItem()) return; - if (action != Action.RIGHT_CLICK_BLOCK) return; - if (block.getType() == Material.AIR) return; Map entitiesAndSpawnItems = this.bossEntityManager.getMapOfEntitiesAndSpawnItems(); ItemStack itemStack = player.getItemInHand(); @@ -67,7 +65,15 @@ public class BossSpawnListener implements Listener { } } - if (bossEntity == null) return; + if (bossEntity == null) + return; + else { + if (action != Action.RIGHT_CLICK_BLOCK + || block.getType() == Material.AIR) { + event.setCancelled(true); + return; + } + } if (bossEntity.isEditing()) { Message.Boss_Edit_CannotSpawn.msg(player); From 7efd9d89f4a914063d47ecb795a51fdddcb62cc9 Mon Sep 17 00:00:00 2001 From: Brianna Date: Tue, 22 Oct 2019 11:58:15 -0400 Subject: [PATCH 6/6] version 1.2.2 --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index f849ebd..3743790 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -4,7 +4,7 @@ stages: variables: name: "EpicBosses" path: "/builds/$CI_PROJECT_PATH" - version: "1.2.1" + version: "1.2.2" build: stage: build