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

Merge branch 'development'

Browse Source
This commit is contained in:
Brianna 2020-09-23 14:40:44 -05:00
commit 40e8629d57
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pom.xml
View File

@ -2,7 +2,7 @@
<groupId>com.songoda</groupId> <groupId>com.songoda</groupId>
<artifactId>UltimateStacker</artifactId> <artifactId>UltimateStacker</artifactId>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<version>2.0.8</version> <version>2.0.8b</version>
<build> <build>
<defaultGoal>clean install</defaultGoal> <defaultGoal>clean install</defaultGoal>
<finalName>UltimateStacker-${project.version}</finalName> <finalName>UltimateStacker-${project.version}</finalName>
@ -97,11 +97,11 @@
<repositories> <repositories>
<repository> <repository>
<id>private</id> <id>private</id>
<url>http://repo.songoda.com/artifactory/private/</url> <url>http://repo.songoda.com/repository/private/</url>
</repository> </repository>
<repository> <repository>
<id>public</id> <id>public</id>
<url>http://repo.songoda.com/artifactory/public/</url> <url>http://repo.songoda.com/repository/public/</url>
</repository> </repository>
<repository> <repository>
<id>CodeMC</id> <id>CodeMC</id>
@ -138,7 +138,7 @@
<dependency> <dependency>
<groupId>com.bgsoftware</groupId> <groupId>com.bgsoftware</groupId>
<artifactId>WildStacker</artifactId> <artifactId>WildStacker</artifactId>
<version>2-9-0</version> <version>b20</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>uk.antiperson</groupId> <groupId>uk.antiperson</groupId>

8
src/main/java/com/songoda/ultimatestacker/convert/WildStackerConvert.java
View File

@ -1,6 +1,5 @@
package com.songoda.ultimatestacker.convert; package com.songoda.ultimatestacker.convert;
import com.bgsoftware.wildstacker.WildStackerPlugin;
import com.bgsoftware.wildstacker.api.WildStackerAPI; import com.bgsoftware.wildstacker.api.WildStackerAPI;
import com.bgsoftware.wildstacker.api.objects.StackedSpawner; import com.bgsoftware.wildstacker.api.objects.StackedSpawner;
import com.songoda.core.database.DatabaseConnector; import com.songoda.core.database.DatabaseConnector;
@ -10,6 +9,7 @@ import com.songoda.ultimatestacker.stackable.entity.EntityStackManager;
import com.songoda.ultimatestacker.stackable.spawner.SpawnerStack; import com.songoda.ultimatestacker.stackable.spawner.SpawnerStack;
import org.bukkit.Bukkit; import org.bukkit.Bukkit;
import org.bukkit.block.CreatureSpawner; import org.bukkit.block.CreatureSpawner;
import org.bukkit.plugin.Plugin;
import java.sql.ResultSet; import java.sql.ResultSet;
import java.sql.Statement; import java.sql.Statement;
@ -17,12 +17,12 @@ import java.util.UUID;
public class WildStackerConvert implements Convert { public class WildStackerConvert implements Convert {
private WildStackerPlugin wildStacker; private Plugin wildStacker;
private final UltimateStacker plugin; private final UltimateStacker plugin;
public WildStackerConvert() { public WildStackerConvert() {
this.plugin = UltimateStacker.getInstance(); this.plugin = UltimateStacker.getInstance();
this.wildStacker = (WildStackerPlugin) Bukkit.getPluginManager().getPlugin("WildStacker"); this.wildStacker = Bukkit.getPluginManager().getPlugin("WildStacker");
} }
@ -75,6 +75,6 @@ public class WildStackerConvert implements Convert {
@Override @Override
public void disablePlugin() { public void disablePlugin() {
Bukkit.getPluginManager().disablePlugin(WildStackerPlugin.getPlugin()); Bukkit.getPluginManager().disablePlugin(wildStacker);
} }
} }