Upstream/zKoth
1
0
Fork 0
mirror of https://github.com/Maxlego08/zKoth.git synced 2025-02-22 02:42:15 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'hotfix/placeholder'

Browse Source
This commit is contained in:
Maxlego08 2020-03-30 19:15:51 +02:00
commit 10f4e016be
3 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/fr/maxlego08/koth/KothPlaceholderExpansion.java
View File

@ -15,7 +15,6 @@ public class KothPlaceholderExpansion extends PlaceholderExpansion {
super(); super();
this.manager = manager; this.manager = manager;
this.version = version; this.version = version;
this.register();
} }
@Override @Override

16
src/fr/maxlego08/koth/ZKoth.java
View File

@ -2,6 +2,8 @@ package fr.maxlego08.koth;
import java.util.concurrent.Callable; import java.util.concurrent.Callable;
import org.bukkit.Bukkit;
import fr.maxlego08.koth.command.CommandManager; import fr.maxlego08.koth.command.CommandManager;
import fr.maxlego08.koth.inventory.InventoryManager; import fr.maxlego08.koth.inventory.InventoryManager;
import fr.maxlego08.koth.listener.AdapterListener; import fr.maxlego08.koth.listener.AdapterListener;
@ -23,12 +25,12 @@ public class ZKoth extends ZPlugin {
public void onEnable() { public void onEnable() {
instance = this; instance = this;
preEnable(); preEnable();
commandManager = new CommandManager(this); commandManager = new CommandManager(this);
commandManager.registerCommands(); commandManager.registerCommands();
if (!isEnabled()) if (!isEnabled())
return; return;
inventoryManager = InventoryManager.getInstance(); inventoryManager = InventoryManager.getInstance();
@ -49,6 +51,11 @@ public class ZKoth extends ZPlugin {
getSavers().forEach(saver -> saver.load(getPersist())); getSavers().forEach(saver -> saver.load(getPersist()));
if (Bukkit.getPluginManager().getPlugin("PlaceholderAPI") != null) {
KothPlaceholderExpansion expansion = new KothPlaceholderExpansion(manager, getDescription().getFullName());
expansion.register();
}
Metrics metrics = new Metrics(this); Metrics metrics = new Metrics(this);
metrics.addCustomChart(new Metrics.SingleLineChart("koths", new Callable<Integer>() { metrics.addCustomChart(new Metrics.SingleLineChart("koths", new Callable<Integer>() {
@Override @Override
@ -56,7 +63,7 @@ public class ZKoth extends ZPlugin {
return manager.size(); return manager.size();
} }
})); }));
postEnable(); postEnable();
} }
@ -85,14 +92,13 @@ public class ZKoth extends ZPlugin {
*/ */
private static volatile ZKoth instance; private static volatile ZKoth instance;
/** /**
* Return a singleton instance of Template. * Return a singleton instance of Template.
*/ */
public static ZKoth getInstance() { public static ZKoth getInstance() {
return instance; return instance;
} }
public KothManager getManager() { public KothManager getManager() {
return manager; return manager;
} }

3
src/fr/maxlego08/koth/zcore/utils/ZUtils.java
View File

@ -675,8 +675,7 @@ public abstract class ZUtils {
*/ */
protected void message(CommandSender player, Message message) { protected void message(CommandSender player, Message message) {
if (player != null) if (player != null)
player = Bukkit.getConsoleSender(); player.sendMessage(Message.PREFIX.msg() + " " + message.msg());
player.sendMessage(Message.PREFIX.msg() + " " + message.msg());
} }
/** /**