SpigotMC/LibsDisguises
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

1.9+ Initial Commit

Browse Source 
LibsDisguises.instance is no longer exposed, replaced with LibsDisguises.getInstance()
This commit is contained in:
NavidK0
2016-02-19 14:23:46 -05:00
parent 321ecdb3c2
commit 9847ff035a
8 changed files with 60 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/main/java/me/libraryaddict/disguise/commands/DisguiseCloneCommand.java
View File

@@ -1,19 +1,17 @@
package me.libraryaddict.disguise.commands;
import java.util.ArrayList;
import java.util.HashMap;
import me.libraryaddict.disguise.DisguiseConfig;
import me.libraryaddict.disguise.DisguiseListener;
import me.libraryaddict.disguise.LibsDisguises;
import me.libraryaddict.disguise.disguisetypes.DisguiseType;
import me.libraryaddict.disguise.utilities.BaseDisguiseCommand;
import org.apache.commons.lang.StringUtils;
import org.bukkit.ChatColor;
import org.bukkit.command.Command;
import org.bukkit.command.CommandSender;
import java.util.ArrayList;
import java.util.HashMap;
public class DisguiseCloneCommand extends BaseDisguiseCommand {
@Override
@@ -43,7 +41,7 @@ public class DisguiseCloneCommand extends BaseDisguiseCommand {
return true;
}
}
LibsDisguises.instance.getListener().setDisguiseClone(sender.getName(), new Boolean[]{doEquipment, doSneak, doSprint});
LibsDisguises.getInstance().getListener().setDisguiseClone(sender.getName(), new Boolean[]{doEquipment, doSneak, doSprint});
sender.sendMessage(ChatColor.RED + "Right click a entity in the next " + DisguiseConfig.getDisguiseCloneExpire()
+ " seconds to grab the disguise reference!");
} else {

10
src/main/java/me/libraryaddict/disguise/commands/DisguiseEntityCommand.java
View File

@@ -1,9 +1,5 @@
package me.libraryaddict.disguise.commands;
import java.lang.reflect.InvocationTargetException;
import java.util.ArrayList;
import java.util.HashMap;
import me.libraryaddict.disguise.DisguiseConfig;
import me.libraryaddict.disguise.LibsDisguises;
import me.libraryaddict.disguise.disguisetypes.Disguise;
@@ -14,6 +10,10 @@ import org.bukkit.ChatColor;
import org.bukkit.command.Command;
import org.bukkit.command.CommandSender;
import java.lang.reflect.InvocationTargetException;
import java.util.ArrayList;
import java.util.HashMap;
public class DisguiseEntityCommand extends BaseDisguiseCommand {
@Override
@@ -34,7 +34,7 @@ public class DisguiseEntityCommand extends BaseDisguiseCommand {
ex.printStackTrace(System.out);
return true;
}
LibsDisguises.instance.getListener().setDisguiseEntity(sender.getName(), disguise);
LibsDisguises.getInstance().getListener().setDisguiseEntity(sender.getName(), disguise);
sender.sendMessage(ChatColor.RED + "Right click a entity in the next " + DisguiseConfig.getDisguiseEntityExpire()
+ " seconds to disguise it as a " + disguise.getType().toReadable() + "!");
return true;

2
src/main/java/me/libraryaddict/disguise/commands/LibsDisguisesCommand.java
View File

@@ -21,7 +21,7 @@ public class LibsDisguisesCommand implements CommandExecutor {
} else if (args.length > 0) {
if (sender.hasPermission("libsdisguises.reload")) {
if (args[0].equalsIgnoreCase("reload")) {
LibsDisguises.instance.reload();
LibsDisguises.getInstance().reload();
sender.sendMessage(ChatColor.GREEN + "[LibsDisguises] Reloaded config.");
return true;
} else {

4
src/main/java/me/libraryaddict/disguise/commands/UndisguiseEntityCommand.java
View File

@@ -1,8 +1,6 @@
package me.libraryaddict.disguise.commands;
import me.libraryaddict.disguise.DisguiseListener;
import me.libraryaddict.disguise.LibsDisguises;
import org.bukkit.ChatColor;
import org.bukkit.command.Command;
import org.bukkit.command.CommandExecutor;
@@ -17,7 +15,7 @@ public class UndisguiseEntityCommand implements CommandExecutor {
return true;
}
if (sender.hasPermission("libsdisguises.undisguiseentity")) {
LibsDisguises.instance.getListener().setDisguiseEntity(sender.getName(), null);
LibsDisguises.getInstance().getListener().setDisguiseEntity(sender.getName(), null);
sender.sendMessage(ChatColor.RED + "Right click a disguised entity to undisguise them!");
} else {
sender.sendMessage(ChatColor.RED + "You are forbidden to use this command.");