Merge branch 'development'

This commit is contained in:
Brianna 2020-09-23 16:12:17 -05:00
commit f5d4e3c8ea
2 changed files with 22 additions and 21 deletions

View File

@ -2,7 +2,7 @@
<groupId>com.songoda</groupId>
<artifactId>UltimateRepairing</artifactId>
<modelVersion>4.0.0</modelVersion>
<version>1.4.3</version>
<version>1.4.3b</version>
<build>
<defaultGoal>clean install</defaultGoal>
<finalName>UltimateRepairing-${project.version}</finalName>
@ -82,11 +82,11 @@
<repositories>
<repository>
<id>private</id>
<url>http://repo.songoda.com/artifactory/private/</url>
<url>http://repo.songoda.com/repository/private/</url>
</repository>
<repository>
<id>public</id>
<url>https://repo.songoda.com/artifactory/public/</url>
<url>https://repo.songoda.com/repository/public/</url>
</repository>
<repository>
<id>spigot-repo</id>

View File

@ -78,7 +78,18 @@ public class UltimateRepairing extends SongodaPlugin {
new CommandSettings(guiManager));
this.commandManager.addCommand(new CommandURAnvil());
Bukkit.getScheduler().runTaskLaterAsynchronously(this, () -> {
// Event registration
guiManager.init();
pluginManager.registerEvents(new PlayerListeners(this), this);
pluginManager.registerEvents(new BlockListeners(this), this);
pluginManager.registerEvents(new InteractListeners(this, guiManager), this);
pluginManager.registerEvents(new InventoryListeners(this), this);
Bukkit.getScheduler().runTaskTimerAsynchronously(this, this::saveToFile, 6000, 6000);
}
@Override
public void onDataLoad() {
/*
* Register anvils into AnvilManager from Configuration.
*/
@ -94,16 +105,6 @@ public class UltimateRepairing extends SongodaPlugin {
}
}
particleTask.start();
}, 6L);
// Event registration
guiManager.init();
pluginManager.registerEvents(new PlayerListeners(this), this);
pluginManager.registerEvents(new BlockListeners(this), this);
pluginManager.registerEvents(new InteractListeners(this, guiManager), this);
pluginManager.registerEvents(new InventoryListeners(this), this);
Bukkit.getScheduler().runTaskTimerAsynchronously(this, this::saveToFile, 6000, 6000);
}
@Override