Page Menu
Home
desp's stash
Search
Configure Global Search
Log In
Files
F191423
No One
Temporary
Actions
View File
Edit File
Delete File
View Transforms
Subscribe
Mute Notifications
Award Token
Flag For Later
Size
5 KB
Subscribers
None
View Options
diff --git a/src/me/despawningbone/HLR/HLRCommandMain.java b/src/me/despawningbone/HLR/HLRCommandMain.java
index af6b2ae..a85b8de 100644
--- a/src/me/despawningbone/HLR/HLRCommandMain.java
+++ b/src/me/despawningbone/HLR/HLRCommandMain.java
@@ -1,141 +1,139 @@
package me.despawningbone.HLR;
import java.util.HashMap;
import org.bukkit.Material;
import org.bukkit.command.Command;
import org.bukkit.command.CommandExecutor;
import org.bukkit.command.CommandSender;
import org.bukkit.entity.Player;
import org.bukkit.inventory.ItemStack;
import org.bukkit.inventory.meta.ItemMeta;
public class HLRCommandMain implements CommandExecutor {
private HLRmain plugin;
//public static Logger log; //debug
public HLRCommandMain(HLRmain instance) {
plugin = instance;
}
public static boolean confirm = false;
public static HashMap<Player, Boolean> start = new HashMap<Player, Boolean>();
public ConfigHandler configHandler;
@SuppressWarnings("deprecation")
public boolean onCommand(CommandSender sender, Command cmd, String commandLabel, String[] args) {
boolean canUseCommand = true;
boolean paying = false;
boolean convert = true;
- configHandler = new ConfigHandler(plugin);
+ configHandler = plugin.configHandler;
//String sstart = String.valueOf(start); //debug
//sender.sendMessage(sstart); //debug
if (sender instanceof Player) {
Player player = (Player) sender;
double fee = configHandler.fee;
boolean useEco = configHandler.useEco;
-
double money = 0;
if (useEco){
money = HLRmain.getMoney(player);
//player.sendMessage(String.valueOf(money)); //debug
//player.sendMessage(String.valueOf(fee)); //debug
}
if (configHandler.usePerms) {
canUseCommand = player.hasPermission("HLR.convert");
}
+
if (!canUseCommand)
sender.sendMessage(ConfigHandler.prefix + ConfigHandler.msgMap.get("ConvertCmd.NoPermsConvert"));
-
if (canUseCommand && fee > 0 && useEco) {
paying = true;
if (money < fee) {
canUseCommand = false;
player.sendMessage(ConfigHandler.prefix + ConfigHandler.msgMap.get("ConvertCmd.NoMoneyConvert"));
}
-
if(configHandler.usePerms){
if(player.hasPermission("HLR.nofee")){
//player.sendMessage("no need to pay"); //debug
paying = false;
}
} else if(player.isOp()) {
paying = false;
}
}
if (canUseCommand) {
ItemStack item; ItemMeta meta;
if(Integer.parseInt(HLRmain.ver.split("\\.")[1].trim()) >= 9) {
item = player.getInventory().getItemInMainHand();
meta = player.getInventory().getItemInMainHand().getItemMeta();
} else {
item = player.getItemInHand();
meta = player.getItemInHand().getItemMeta();
}
String CHname = HLRmain.CHname;
int maxamount = configHandler.maxamount;
if(configHandler.usePerms) {
if(player.hasPermission("HLR.limitbypass")) {
maxamount = 64;
}
} else if(player.isOp()) {
maxamount = 64;
}
if(start.isEmpty() || !start.containsKey(player)) {
start.put(player, false);
}
if(!configHandler.cooldown || !start.get(player)) {
if(item.getType().equals(Material.HOPPER)){
if(item.getAmount() <= maxamount) {
if (meta.hasLore() && meta.hasDisplayName()){
if(meta.getLore().equals(HLRmain.hopperlore) || meta.getDisplayName().equals(HLRmain.CHname)){
convert = false;
}
}
if(convert) {
meta.setDisplayName(CHname);
meta.setLore(HLRmain.hopperlore);
item.setItemMeta(meta);
player.sendMessage(ConfigHandler.prefix + ConfigHandler.msgMap.get("ConvertCmd.ConvertSuccess"));
if(configHandler.cooldown) {
if(configHandler.usePerms) {
if(!player.hasPermission("HLR.nocooldown")) {
//player.sendMessage("Start-nperms"); //debug
start.put(player, true);
Timer timer = new Timer();
timer.main(player);
}
} else if(!player.isOp()) {
//player.sendMessage("Start-nop"); //debug
start.put(player, true);
Timer timer = new Timer();
timer.main(player);
}
}
if (paying) {
HLRmain.econ.withdrawPlayer(player, fee);
paying = false;
player.sendMessage(ConfigHandler.prefix + ConfigHandler.msgMap.get("ConvertCmd.TransactionCost"));
}
} else {
player.sendMessage(ConfigHandler.prefix + ConfigHandler.msgMap.get("ConvertCmd.ConvertedHopper"));
}
} else {
player.sendMessage(ConfigHandler.prefix + ConfigHandler.msgMap.get("ConvertCmd.TooMuchHopperAtOnce"));
}
} else {
player.sendMessage(ConfigHandler.prefix + ConfigHandler.msgMap.get("ConvertCmd.NotHoldingHopper"));
}
} else {
player.sendMessage(ConfigHandler.prefix + ConfigHandler.msgMap.get("ConvertCmd.StillCoolingDown"));
}
}
} else {
sender.sendMessage(ConfigHandler.msgMap.get("ConvertCmd.PlayerUseOnly"));
}
return true;
}
}
File Metadata
Details
Attached
Mime Type
text/x-diff
Expires
Sat, Sep 21, 11:42 PM (1 d, 19 h)
Storage Engine
local-disk
Storage Format
Raw Data
Storage Handle
74/bd/49f2e8bce9edaeff6f2e556dd768
Attached To
rHLR HLR
Event Timeline
Log In to Comment