Fork/mmocore
1
0
Fork 0
forked from Upstream/mmocore
Code Pull Requests Activity

Merge branch 'master' into Ricardo

Browse Source 
# Conflicts:
#	src/main/java/net/Indyuce/mmocore/api/player/PlayerData.java
This commit is contained in:
RicardormDev 2021-02-09 10:58:00 -06:00
commit b8f8dbf419
No known key found for this signature in database
GPG Key ID: DDC0B37FB6B8C169
2 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pom.xml
View File

@ -4,9 +4,9 @@
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<groupId>net.Indyuce</groupId> <groupId>net.Indyuce</groupId>
<artifactId>MMOCore</artifactId> <artifactId>MMOCore</artifactId>
<version>1.6.2</version> <version>1.7.0</version>
<name>MMOCore</name> <name>MMOCore</name>
<description>Offer your players a brand new RPG experience.</description> <description>Offer your players a brand new RPG experience!</description>
<properties> <properties>
<downloadSources>false</downloadSources> <downloadSources>false</downloadSources>
@ -122,7 +122,7 @@
<dependency> <dependency>
<groupId>io.lumine</groupId> <groupId>io.lumine</groupId>
<artifactId>MythicLib</artifactId> <artifactId>MythicLib</artifactId>
<version>0.0.1-SNAPSHOT</version> <version>1.0.0</version>
<scope>provided</scope> <scope>provided</scope>
</dependency> </dependency>

9
src/main/java/net/Indyuce/mmocore/MMOCore.java
View File

@ -2,6 +2,7 @@ package net.Indyuce.mmocore;
import io.lumine.mythic.lib.comp.Metrics; import io.lumine.mythic.lib.comp.Metrics;
import io.lumine.mythic.lib.version.SpigotPlugin; import io.lumine.mythic.lib.version.SpigotPlugin;
import io.lumine.mythic.utils.plugin.LuminePlugin;
import net.Indyuce.mmocore.api.ConfigFile; import net.Indyuce.mmocore.api.ConfigFile;
import net.Indyuce.mmocore.api.PlayerActionBar; import net.Indyuce.mmocore.api.PlayerActionBar;
import net.Indyuce.mmocore.api.loot.LootChest; import net.Indyuce.mmocore.api.loot.LootChest;
@ -62,7 +63,7 @@ import java.lang.reflect.Field;
import java.util.HashSet; import java.util.HashSet;
import java.util.logging.Level; import java.util.logging.Level;
public class MMOCore extends JavaPlugin { public class MMOCore extends LuminePlugin {
public static MMOCore plugin; public static MMOCore plugin;
public ConfigManager configManager; public ConfigManager configManager;
@ -103,7 +104,7 @@ public class MMOCore extends JavaPlugin {
public boolean shouldDebugSQL = false; public boolean shouldDebugSQL = false;
public void onLoad() { public void load() {
plugin = this; plugin = this;
/* /*
@ -127,7 +128,7 @@ public class MMOCore extends JavaPlugin {
if (Bukkit.getPluginManager().getPlugin("WorldGuard") != null) flagPlugin = new WorldGuardFlags(); if (Bukkit.getPluginManager().getPlugin("WorldGuard") != null) flagPlugin = new WorldGuardFlags();
} }
public void onEnable() { public void enable() {
new SpigotPlugin(70575, this).checkForUpdate(); new SpigotPlugin(70575, this).checkForUpdate();
new Metrics(this); new Metrics(this);
saveDefaultConfig(); saveDefaultConfig();
@ -329,7 +330,7 @@ public class MMOCore extends JavaPlugin {
} }
} }
public void onDisable() { public void disable() {
for (PlayerData data : PlayerData.getAll()) { for (PlayerData data : PlayerData.getAll()) {
if(!data.isFullyLoaded()) return; if(!data.isFullyLoaded()) return;
data.getQuestData().resetBossBar(); data.getQuestData().resetBossBar();