diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
deleted file mode 100644
index 6c1ad30..0000000
--- a/.gitlab-ci.yml
+++ /dev/null
@@ -1,21 +0,0 @@
-stages:
- - build
-
-variables:
- name: "EpicBosses"
- path: "/builds/$CI_PROJECT_PATH"
- version: "1.2.4"
-
-build:
- stage: build
- image: maven:3.5.3-jdk-8
- script:
- - find $path/ -type f -name "*.xml" -print0 | xargs -0 sed -i -e s/maven-version-number/$version/g
- - find $path/ -type f -name "*.yml" -print0 | xargs -0 sed -i -e s/maven-version-number/$version/g
- - mvn clean package
- - find $path/ -depth -path '*original*' -delete
- - mv $path/plugin-modules/Core/target/*.jar $path/
- artifacts:
- name: $name-$version
- paths:
- - "$path/*.jar"
diff --git a/api-modules/FactionsM/pom.xml b/api-modules/FactionsM/pom.xml
index 2258409..5788c8d 100644
--- a/api-modules/FactionsM/pom.xml
+++ b/api-modules/FactionsM/pom.xml
@@ -5,7 +5,7 @@
EpicBosses
com.songoda.epicbosses
- maven-version-number
+ 1.2.5
../../pom.xml
4.0.0
@@ -17,7 +17,7 @@
org.spigotmc
spigot
- 1.14.4
+ 1.15
provided
diff --git a/api-modules/FactionsOne/pom.xml b/api-modules/FactionsOne/pom.xml
index eb96e29..9fb167a 100644
--- a/api-modules/FactionsOne/pom.xml
+++ b/api-modules/FactionsOne/pom.xml
@@ -5,7 +5,7 @@
EpicBosses
com.songoda.epicbosses
- maven-version-number
+ 1.2.5
../../pom.xml
4.0.0
@@ -17,7 +17,7 @@
org.spigotmc
spigot
- 1.14.4
+ 1.15
provided
diff --git a/api-modules/FactionsUUID/pom.xml b/api-modules/FactionsUUID/pom.xml
index de88390..cb520d4 100644
--- a/api-modules/FactionsUUID/pom.xml
+++ b/api-modules/FactionsUUID/pom.xml
@@ -5,7 +5,7 @@
EpicBosses
com.songoda.epicbosses
- maven-version-number
+ 1.2.5
../../pom.xml
4.0.0
@@ -17,7 +17,7 @@
org.spigotmc
spigot
- 1.14.4
+ 1.15
provided
diff --git a/api-modules/LegacyFactions/pom.xml b/api-modules/LegacyFactions/pom.xml
index 0cea1b1..88f1f66 100644
--- a/api-modules/LegacyFactions/pom.xml
+++ b/api-modules/LegacyFactions/pom.xml
@@ -5,7 +5,7 @@
EpicBosses
com.songoda.epicbosses
- maven-version-number
+ 1.2.5
../../pom.xml
4.0.0
@@ -17,7 +17,7 @@
org.spigotmc
spigot
- 1.14.4
+ 1.15
provided
diff --git a/plugin-modules/Core/pom.xml b/plugin-modules/Core/pom.xml
index aa62cd0..e9bd840 100644
--- a/plugin-modules/Core/pom.xml
+++ b/plugin-modules/Core/pom.xml
@@ -5,7 +5,7 @@
EpicBosses
com.songoda.epicbosses
- maven-version-number
+ 1.2.5
../../pom.xml
4.0.0
@@ -17,7 +17,7 @@
org.spigotmc
spigot
- 1.14.4
+ 1.15
provided
diff --git a/plugin-modules/Core/src/com/songoda/epicbosses/holder/ActiveBossHolder.java b/plugin-modules/Core/src/com/songoda/epicbosses/holder/ActiveBossHolder.java
index d7fea15..4ae0a3b 100644
--- a/plugin-modules/Core/src/com/songoda/epicbosses/holder/ActiveBossHolder.java
+++ b/plugin-modules/Core/src/com/songoda/epicbosses/holder/ActiveBossHolder.java
@@ -105,7 +105,7 @@ public class ActiveBossHolder implements IActiveHolder {
// grab list of all valid entities by UUID that can be removed
Map toRemove = this.livingEntityMap.entrySet().stream()
- .collect(Collectors.toMap(e -> e.getKey(), e -> ServerUtils.get().getEntity(e.getValue())))
+ .collect(Collectors.toMap(Map.Entry::getKey, e -> ServerUtils.get().getEntity(e.getValue())))
.entrySet().stream()
.filter(e -> e.getValue() != null && e.getValue().getWorld().isChunkLoaded(
e.getValue().getLocation().getBlockX() >> 4,
diff --git a/plugin-modules/Core/src/com/songoda/epicbosses/utils/EntityFinder.java b/plugin-modules/Core/src/com/songoda/epicbosses/utils/EntityFinder.java
index 4be5b41..c6cadf3 100644
--- a/plugin-modules/Core/src/com/songoda/epicbosses/utils/EntityFinder.java
+++ b/plugin-modules/Core/src/com/songoda/epicbosses/utils/EntityFinder.java
@@ -76,6 +76,7 @@ public enum EntityFinder {
TURTLE("Turtle", new TurtleHandler(), "turtle"),
PHANTOM("Phantom", new PhantomHandler(), "phantom"),
CAT("Cat", new CatHandler(), "cat"),
+ BEE("Bee", new BeeHandler(), "bee"),
FOX("Fox", new FoxHandler(), "fox"),
PANDA("Panda", new PandaHandler(), "panda"),
PILLAGER("Pillager", new PillagerHandler(), "pillager"),
diff --git a/plugin-modules/Core/src/com/songoda/epicbosses/utils/entity/handlers/BeeHandler.java b/plugin-modules/Core/src/com/songoda/epicbosses/utils/entity/handlers/BeeHandler.java
new file mode 100644
index 0000000..bb03494
--- /dev/null
+++ b/plugin-modules/Core/src/com/songoda/epicbosses/utils/entity/handlers/BeeHandler.java
@@ -0,0 +1,19 @@
+package com.songoda.epicbosses.utils.entity.handlers;
+
+import com.songoda.core.compatibility.ServerVersion;
+import com.songoda.epicbosses.utils.entity.ICustomEntityHandler;
+import org.bukkit.Location;
+import org.bukkit.entity.EntityType;
+import org.bukkit.entity.LivingEntity;
+
+public class BeeHandler implements ICustomEntityHandler {
+
+ @Override
+ public LivingEntity getBaseEntity(String entityType, Location spawnLocation) {
+ if (ServerVersion.isServerVersionBelow(ServerVersion.V1_15)) {
+ throw new NullPointerException("This feature is only implemented in version 1.15 and above of Minecraft.");
+ }
+
+ return (LivingEntity) spawnLocation.getWorld().spawnEntity(spawnLocation, EntityType.BEE);
+ }
+}
diff --git a/plugin-modules/FactionHelper/pom.xml b/plugin-modules/FactionHelper/pom.xml
index d6415cb..f90804b 100644
--- a/plugin-modules/FactionHelper/pom.xml
+++ b/plugin-modules/FactionHelper/pom.xml
@@ -5,7 +5,7 @@
EpicBosses
com.songoda.epicbosses
- maven-version-number
+ 1.2.5
../../pom.xml
4.0.0
@@ -16,7 +16,7 @@
org.spigotmc
spigot
- 1.14.4
+ 1.15
provided
diff --git a/pom.xml b/pom.xml
index c4c506e..a9e2601 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,13 +1,10 @@
-
-
+
4.0.0
com.songoda.epicbosses
EpicBosses
pom
- maven-version-number
+ 1.2.5
api-modules/FactionsM
@@ -19,10 +16,10 @@
- maven-version-number
+ 1.2.5
EpicBosses
com.songoda.epicbosses.EpicBosses
- AMinecraftDev
+ Songoda
@@ -48,12 +45,13 @@
- private-repo
+ private
http://repo.songoda.com/artifactory/private/
+ clean install
src
test