Minecraft/EpicSpawners
1
0
Fork 0
mirror of https://github.com/craftaro/EpicSpawners.git synced 2025-01-09 03:57:40 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge origin/master

Browse Source 
Conflicts:
	EpicSpawners-Plugin/src/main/resources/plugin.yml
	pom.xml
This commit is contained in:
Frostalf 2018-11-15 00:38:13 -08:00
commit 4262d3a5f6
5 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
EpicSpawners-API/pom.xml
View File

@ -5,7 +5,7 @@
<parent>
<groupId>com.songoda</groupId>
<artifactId>EpicSpawners-Parent</artifactId>
<version>5.5.15</version>
<version>5.5.16</version>
</parent>
<groupId>com.songoda</groupId>
<artifactId>EpicSpawners-API</artifactId>

7
EpicSpawners-Plugin/pom.xml
View File

@ -5,7 +5,7 @@
<parent>
<groupId>com.songoda</groupId>
<artifactId>EpicSpawners-Parent</artifactId>
<version>5.5.15</version>
<version>5.5.16</version>
</parent>
<groupId>com.songoda</groupId>
<artifactId>EpicSpawners-Plugin</artifactId>
@ -23,6 +23,11 @@
<version>${project.version}</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>net.arcaniax</groupId>
<artifactId>liquidtanks</artifactId>
<version>LATEST</version>
</dependency>
<dependency>
<groupId>com.songoda</groupId>
<artifactId>arconix</artifactId>

2
EpicSpawners-Plugin/src/main/java/com/songoda/epicspawners/EpicSpawnersPlugin.java
View File

@ -172,7 +172,6 @@ public class EpicSpawnersPlugin extends JavaPlugin implements EpicSpawners {
this.spawnerManager = new ESpawnerManager();
this.commandManager = new CommandManager(this);
this.blacklistHandler = new BlacklistHandler();
this.hologramHandler = new HologramHandler(this);
this.playerActionManager = new PlayerActionManager();
this.chatListeners = new ChatListeners(this);
@ -252,6 +251,7 @@ public class EpicSpawnersPlugin extends JavaPlugin implements EpicSpawners {
}
// Save data initially so that if the person reloads again fast they don't lose all their data.
this.saveToFile();
this.hologramHandler = new HologramHandler(this);
}, 10);
this.shop = new Shop(this);

2
EpicSpawners-Plugin/src/main/resources/plugin.yml
View File

@ -19,4 +19,4 @@ commands:
SpawnerShop:
description: I have no idea.
default: false
usage: /<command> [reload]
usage: /<command> [reload]

2
pom.xml
View File

@ -5,7 +5,7 @@
<groupId>com.songoda</groupId>
<artifactId>EpicSpawners-Parent</artifactId>
<packaging>pom</packaging>
<version>5.5.15</version>
<version>5.5.16</version>
<modules>
<module>EpicSpawners-API</module>