Upstream/EpicBosses
1
0
Fork 0
mirror of https://github.com/songoda/EpicBosses.git synced 2024-11-14 05:45:16 +01:00
Code Issues Projects Releases Wiki Activity

1.0.5

Browse Source 
+ Fixed issue with potion effects lagging the server
+ Fixed issue with potion effect types not being compatible in 1.8.8 or other versions
+ Fixed issue with PotionEffectConverter throwing NPE if input is null
+ General Project clean up
+ Fixed /boss new autospawn command not working
This commit is contained in:
Charles 2019-02-01 01:56:04 +08:00
parent ab697c73cd
commit 8a71c487f7
18 changed files with 111 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
.idea/libraries/Maven__com_massivecraft_FactionsOne_1_2_1.xml Normal file
View File

@ -0,0 +1,13 @@
<component name="libraryTable">
<library name="Maven: com.massivecraft:FactionsOne:1.2.1">
<CLASSES>
<root url="jar://$MAVEN_REPOSITORY$/com/massivecraft/FactionsOne/1.2.1/FactionsOne-1.2.1.jar!/" />
</CLASSES>
<JAVADOC>
<root url="jar://$MAVEN_REPOSITORY$/com/massivecraft/FactionsOne/1.2.1/FactionsOne-1.2.1-javadoc.jar!/" />
</JAVADOC>
<SOURCES>
<root url="jar://$MAVEN_REPOSITORY$/com/massivecraft/FactionsOne/1.2.1/FactionsOne-1.2.1-sources.jar!/" />
</SOURCES>
</library>
</component>

13
.idea/libraries/Maven__com_massivecraft_factions_FactionsUUID_1_6_9_5_U0_1_21.xml Normal file
View File

@ -0,0 +1,13 @@
<component name="libraryTable">
<library name="Maven: com.massivecraft.factions:FactionsUUID:1.6.9.5-U0.1.21">
<CLASSES>
<root url="jar://$MAVEN_REPOSITORY$/com/massivecraft/factions/FactionsUUID/1.6.9.5-U0.1.21/FactionsUUID-1.6.9.5-U0.1.21.jar!/" />
</CLASSES>
<JAVADOC>
<root url="jar://$MAVEN_REPOSITORY$/com/massivecraft/factions/FactionsUUID/1.6.9.5-U0.1.21/FactionsUUID-1.6.9.5-U0.1.21-javadoc.jar!/" />
</JAVADOC>
<SOURCES>
<root url="jar://$MAVEN_REPOSITORY$/com/massivecraft/factions/FactionsUUID/1.6.9.5-U0.1.21/FactionsUUID-1.6.9.5-U0.1.21-sources.jar!/" />
</SOURCES>
</library>
</component>

13
.idea/libraries/Maven__com_massivecraft_factions_Factions_2_13_3_SNAPSHOT.xml Normal file
View File

@ -0,0 +1,13 @@
<component name="libraryTable">
<library name="Maven: com.massivecraft.factions:Factions:2.13.3-SNAPSHOT">
<CLASSES>
<root url="jar://$MAVEN_REPOSITORY$/com/massivecraft/factions/Factions/2.13.3-SNAPSHOT/Factions-2.13.3-SNAPSHOT.jar!/" />
</CLASSES>
<JAVADOC>
<root url="jar://$MAVEN_REPOSITORY$/com/massivecraft/factions/Factions/2.13.3-SNAPSHOT/Factions-2.13.3-SNAPSHOT-javadoc.jar!/" />
</JAVADOC>
<SOURCES>
<root url="jar://$MAVEN_REPOSITORY$/com/massivecraft/factions/Factions/2.13.3-SNAPSHOT/Factions-2.13.3-SNAPSHOT-sources.jar!/" />
</SOURCES>
</library>
</component>

13
.idea/libraries/Maven__com_massivecraft_massivecore_MassiveCore_2_13_3_1_SNAPSHOT.xml Normal file
View File

@ -0,0 +1,13 @@
<component name="libraryTable">
<library name="Maven: com.massivecraft.massivecore:MassiveCore:2.13.3.1-SNAPSHOT">
<CLASSES>
<root url="jar://$MAVEN_REPOSITORY$/com/massivecraft/massivecore/MassiveCore/2.13.3.1-SNAPSHOT/MassiveCore-2.13.3.1-SNAPSHOT.jar!/" />
</CLASSES>
<JAVADOC>
<root url="jar://$MAVEN_REPOSITORY$/com/massivecraft/massivecore/MassiveCore/2.13.3.1-SNAPSHOT/MassiveCore-2.13.3.1-SNAPSHOT-javadoc.jar!/" />
</JAVADOC>
<SOURCES>
<root url="jar://$MAVEN_REPOSITORY$/com/massivecraft/massivecore/MassiveCore/2.13.3.1-SNAPSHOT/MassiveCore-2.13.3.1-SNAPSHOT-sources.jar!/" />
</SOURCES>
</library>
</component>

8
.idea/libraries/Maven__org_spigotmc_spigot_1_12_2.xml → .idea/libraries/Maven__com_spigotmc_spigot_1_12_2.xml
View File

@ -1,13 +1,13 @@
<component name="libraryTable">
<library name="Maven: org.spigotmc:spigot:1.12.2">
<library name="Maven: com.spigotmc:spigot:1.12.2">
<CLASSES>
<root url="jar://$MAVEN_REPOSITORY$/org/spigotmc/spigot/1.12.2/spigot-1.12.2.jar!/" />
<root url="jar://$MAVEN_REPOSITORY$/com/spigotmc/spigot/1.12.2/spigot-1.12.2.jar!/" />
</CLASSES>
<JAVADOC>
<root url="jar://$MAVEN_REPOSITORY$/org/spigotmc/spigot/1.12.2/spigot-1.12.2-javadoc.jar!/" />
<root url="jar://$MAVEN_REPOSITORY$/com/spigotmc/spigot/1.12.2/spigot-1.12.2-javadoc.jar!/" />
</JAVADOC>
<SOURCES>
<root url="jar://$MAVEN_REPOSITORY$/org/spigotmc/spigot/1.12.2/spigot-1.12.2-sources.jar!/" />
<root url="jar://$MAVEN_REPOSITORY$/com/spigotmc/spigot/1.12.2/spigot-1.12.2-sources.jar!/" />
</SOURCES>
</library>
</component>

13
.idea/libraries/Maven__net_milkbowl_vault_Vault_1_6_6.xml Normal file
View File

@ -0,0 +1,13 @@
<component name="libraryTable">
<library name="Maven: net.milkbowl.vault:Vault:1.6.6">
<CLASSES>
<root url="jar://$MAVEN_REPOSITORY$/net/milkbowl/vault/Vault/1.6.6/Vault-1.6.6.jar!/" />
</CLASSES>
<JAVADOC>
<root url="jar://$MAVEN_REPOSITORY$/net/milkbowl/vault/Vault/1.6.6/Vault-1.6.6-javadoc.jar!/" />
</JAVADOC>
<SOURCES>
<root url="jar://$MAVEN_REPOSITORY$/net/milkbowl/vault/Vault/1.6.6/Vault-1.6.6-sources.jar!/" />
</SOURCES>
</library>
</component>

13
.idea/libraries/Maven__net_redstoneore_legacyfactions_LegacyFactions_1_4_7.xml Normal file
View File

@ -0,0 +1,13 @@
<component name="libraryTable">
<library name="Maven: net.redstoneore.legacyfactions:LegacyFactions:1.4.7">
<CLASSES>
<root url="jar://$MAVEN_REPOSITORY$/net/redstoneore/legacyfactions/LegacyFactions/1.4.7/LegacyFactions-1.4.7.jar!/" />
</CLASSES>
<JAVADOC>
<root url="jar://$MAVEN_REPOSITORY$/net/redstoneore/legacyfactions/LegacyFactions/1.4.7/LegacyFactions-1.4.7-javadoc.jar!/" />
</JAVADOC>
<SOURCES>
<root url="jar://$MAVEN_REPOSITORY$/net/redstoneore/legacyfactions/LegacyFactions/1.4.7/LegacyFactions-1.4.7-sources.jar!/" />
</SOURCES>
</library>
</component>

8
api-modules/FactionsM/pom.xml
View File

@ -21,15 +21,15 @@
<scope>provided</scope>
</dependency>
<dependency>
<groupId>com.massivecraft</groupId>
<groupId>com.massivecraft.factions</groupId>
<artifactId>Factions</artifactId>
<version>LATEST</version>
<version>2.13.3-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>com.massivecraft</groupId>
<groupId>com.massivecraft.massivecore</groupId>
<artifactId>MassiveCore</artifactId>
<version>LATEST</version>
<version>2.13.3.1-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
</dependencies>

4
api-modules/FactionsUUID/pom.xml
View File

@ -21,9 +21,9 @@
<scope>provided</scope>
</dependency>
<dependency>
<groupId>com.massivecraft</groupId>
<groupId>com.massivecraft.factions</groupId>
<artifactId>FactionsUUID</artifactId>
<version>LATEST</version>
<version>1.6.9.5-U0.1.21</version>
<scope>provided</scope>
</dependency>
</dependencies>

4
api-modules/LegacyFactions/pom.xml
View File

@ -21,9 +21,9 @@
<scope>provided</scope>
</dependency>
<dependency>
<groupId>com.massivecraft</groupId>
<groupId>net.redstoneore.legacyfactions</groupId>
<artifactId>LegacyFactions</artifactId>
<version>LATEST</version>
<version>1.4.7</version>
<scope>provided</scope>
</dependency>
</dependencies>

4
plugin-modules/Core/src/com/songoda/epicbosses/commands/boss/BossNewCmd.java
View File

@ -27,7 +27,7 @@ import java.util.List;
* boss new skill [name] [type] [mode]
* boss new command [name] [commands]
* boss new message [name] [message]
* boss new autospawn [name] [type]
* boss new autospawn [name]
*/
public class BossNewCmd extends SubCommand {
@ -61,7 +61,7 @@ public class BossNewCmd extends SubCommand {
//--------------------
// A U T O S P A W N
//--------------------
if(args.length == 4 && args[1].equalsIgnoreCase("autospawn")) {
if(args.length == 3 && args[1].equalsIgnoreCase("autospawn")) {
String nameInput = args[2];
if(this.autoSpawnFileManager.getAutoSpawn(nameInput) != null) {

4
plugin-modules/Core/src/com/songoda/epicbosses/listeners/pre/BossSpawnListener.java
View File

@ -2,7 +2,6 @@ package com.songoda.epicbosses.listeners.pre;
import com.songoda.epicbosses.CustomBosses;
import com.songoda.epicbosses.api.BossAPI;
import com.songoda.epicbosses.container.BossEntityContainer;
import com.songoda.epicbosses.entity.BossEntity;
import com.songoda.epicbosses.events.BossSpawnEvent;
import com.songoda.epicbosses.events.PreBossSpawnEvent;
@ -15,7 +14,6 @@ import com.songoda.epicbosses.managers.BossTauntManager;
import com.songoda.epicbosses.utils.*;
import com.songoda.epicbosses.utils.itemstack.ItemStackUtils;
import com.songoda.epicbosses.utils.version.VersionHandler;
import org.bukkit.Bukkit;
import org.bukkit.Location;
import org.bukkit.Material;
import org.bukkit.block.Block;
@ -38,7 +36,6 @@ import java.util.Map;
public class BossSpawnListener implements Listener {
private BossLocationManager bossLocationManager;
private BossTargetManager bossTargetManager;
private BossEntityManager bossEntityManager;
private BossTauntManager bossTauntManager;
private VersionHandler versionHandler;
@ -47,7 +44,6 @@ public class BossSpawnListener implements Listener {
this.versionHandler = customBosses.getVersionHandler();
this.bossTauntManager = customBosses.getBossTauntManager();
this.bossEntityManager = customBosses.getBossEntityManager();
this.bossTargetManager = customBosses.getBossTargetManager();
this.bossLocationManager = customBosses.getBossLocationManager();
}

14
plugin-modules/Core/src/com/songoda/epicbosses/utils/PotionEffectFinder.java
View File

@ -1,6 +1,7 @@
package com.songoda.epicbosses.utils;
import lombok.Getter;
import org.bukkit.potion.PotionEffect;
import org.bukkit.potion.PotionEffectType;
import java.util.ArrayList;
@ -20,7 +21,7 @@ public enum PotionEffectFinder {
Resistance("Resistance", PotionEffectType.DAMAGE_RESISTANCE, "damage_resistance", "res", "damageresistance"),
Haste("Haste", PotionEffectType.FAST_DIGGING, "fast_digging", "haste"),
Fire_Resistance("FireResistance", PotionEffectType.FIRE_RESISTANCE, "fire_resistance", "fire_resist", "fire_res", "fireresist", "fireres"),
Glowing("Glowing", PotionEffectType.GLOWING),
Glowing("Glowing", PotionEffectType.getByName("GLOWING")),
Harm("Harm", PotionEffectType.HARM, "damage"),
Heal("Heal", PotionEffectType.HEAL),
HealthBoost("HealthBoost", PotionEffectType.HEALTH_BOOST, "healthboost", "health_boost"),
@ -28,8 +29,8 @@ public enum PotionEffectFinder {
Strength("Strength", PotionEffectType.INCREASE_DAMAGE, "increase_damage", "increasedamage"),
Invisibility("Invisibility", PotionEffectType.INVISIBILITY),
Jump("Jump", PotionEffectType.JUMP),
Levitation("Levitation", PotionEffectType.LEVITATION),
Luck("Luck", PotionEffectType.LUCK),
Levitation("Levitation", PotionEffectType.getByName("LEVITATION")),
Luck("Luck", PotionEffectType.getByName("LUCK")),
NightVision("NightVision", PotionEffectType.NIGHT_VISION, "seeinthedarkness", "nv", "night_vision"),
Posion("Posion", PotionEffectType.POISON, "witched"),
Regen("regen", PotionEffectType.REGENERATION, "regeneration"),
@ -37,7 +38,7 @@ public enum PotionEffectFinder {
Slow("Slow", PotionEffectType.SLOW, "tank"),
MiningFatigue("MiningFatigue", PotionEffectType.SLOW_DIGGING, "slow_digging"),
Speed("Speed", PotionEffectType.SPEED, "fast", "fastboots"),
Unluck("Unlucky", PotionEffectType.UNLUCK, "unluck", "notlucky"),
Unluck("Unlucky", PotionEffectType.getByName("UNLUCK"), "unluck", "notlucky"),
WaterBreathing("WaterBreathing", PotionEffectType.WATER_BREATHING, "breathunderwater", "water_breathing", "fish"),
Weakness("Weakness", PotionEffectType.WEAKNESS),
Wither("Wither", PotionEffectType.WITHER, "blackhearts");
@ -68,7 +69,10 @@ public enum PotionEffectFinder {
public static PotionEffectFinder getByEffect(PotionEffectType potionEffectType) {
for(PotionEffectFinder potionEffectFinder : values()) {
if(potionEffectType.equals(potionEffectFinder.getPotionEffectType())) return potionEffectFinder;
PotionEffectType effectType = potionEffectFinder.getPotionEffectType();
if(effectType == null) continue;
if(potionEffectType.equals(effectType)) return potionEffectFinder;
}
return null;

2
plugin-modules/Core/src/com/songoda/epicbosses/utils/dependencies/HolographicDisplayHelper.java
View File

@ -24,7 +24,7 @@ public class HolographicDisplayHelper implements IHelper {
CustomBosses plugin = CustomBosses.get();
Hologram hologram = HologramsAPI.createHologram(plugin, livingEntity.getEyeLocation());
hologram.insertTextLine(1, line);
hologram.appendTextLine(line);
new BukkitRunnable() {
@Override

2
plugin-modules/Core/src/com/songoda/epicbosses/utils/potion/PotionEffectConverter.java
View File

@ -41,7 +41,7 @@ public class PotionEffectConverter implements IConverter<PotionEffectHolder, Pot
if(duration < 1) duration = (Integer.MAX_VALUE / 20);
if(potionEffectTypeConverted == null) return null;
if(potionEffectType != null) return new PotionEffect(potionEffectTypeConverted, level-1, (duration*20));
if(potionEffectType != null) return new PotionEffect(potionEffectTypeConverted, duration*20, level-1);
return null;
}

2
plugin-modules/Core/src/com/songoda/epicbosses/utils/potion/converters/PotionEffectTypeConverter.java
View File

@ -22,6 +22,8 @@ public class PotionEffectTypeConverter implements IConverter<String, PotionEffec
@Override
public PotionEffectType from(String s) {
if(s == null) return null;
PotionEffectFinder potionEffectFinder = PotionEffectFinder.getByName(s);
if(potionEffectFinder == null) return null;

7
plugin-modules/Core/src/com/songoda/epicbosses/utils/time/TimeUnit.java
View File

@ -4,14 +4,9 @@ package com.songoda.epicbosses.utils.time;
* @author AMinecraftDev
* @version 1.0.0
* @since 23-May-17
*/
/**
*
* Makes it easy to convert
* time
*
* @author Debugged
* @version 1.0.0
* @since 3-1-2017
*/
public enum TimeUnit {

14
pom.xml
View File

@ -19,7 +19,7 @@
</modules>
<properties>
<plugin.version>1.0.4</plugin.version>
<plugin.version>1.0.5</plugin.version>
<plugin.name>EpicBosses</plugin.name>
<plugin.main>com.songoda.epicbosses.CustomBosses</plugin.main>
<plugin.author>AMinecraftDev</plugin.author>
@ -27,15 +27,15 @@
<dependencies>
<dependency>
<groupId>org.spigotmc</groupId>
<groupId>com.spigotmc</groupId>
<artifactId>spigot</artifactId>
<version>1.12.2</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>net.milkbowl</groupId>
<artifactId>vault</artifactId>
<version>LATEST</version>
<groupId>net.milkbowl.vault</groupId>
<artifactId>Vault</artifactId>
<version>1.6.6</version>
<scope>provided</scope>
</dependency>
<dependency>
@ -81,10 +81,6 @@
<id>filoghost-repo</id>
<url>https://ci.filoghost.me/plugin/repository/everything/</url>
</repository>
<repository>
<id>private</id>
<url>http://repo.songoda.com/repository/private/</url>
</repository>
<repository>
<id>vault-repo</id>
<url>http://nexus.hc.to/content/repositories/pub_releases</url>