Upstream/ChestShop-3
1
0
Fork 0
mirror of https://github.com/ChestShop-authors/ChestShop-3.git synced 2025-01-25 08:11:20 +01:00
Code Issues Projects Releases Wiki Activity

Try to fix a few more errors

Browse Source 
Fixes #7
This commit is contained in:
Dan Mulloy 2016-09-20 15:45:18 -04:00
parent 3fa939983b
commit e186635484
4 changed files with 18 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/main/java/com/Acrobot/ChestShop/Listeners/Player/PlayerConnect.java
View File

@ -1,16 +1,14 @@
package com.Acrobot.ChestShop.Listeners.Player; package com.Acrobot.ChestShop.Listeners.Player;
import com.Acrobot.Breeze.Utils.NameUtil;
import com.Acrobot.ChestShop.ChestShop;
import com.Acrobot.ChestShop.UUIDs.NameManager;
import com.Acrobot.ChestShop.UUIDs.PlayerDTO;
import org.bukkit.Bukkit; import org.bukkit.Bukkit;
import org.bukkit.event.EventHandler; import org.bukkit.event.EventHandler;
import org.bukkit.event.EventPriority; import org.bukkit.event.EventPriority;
import org.bukkit.event.Listener; import org.bukkit.event.Listener;
import org.bukkit.event.player.PlayerJoinEvent; import org.bukkit.event.player.PlayerJoinEvent;
import java.util.UUID; import com.Acrobot.ChestShop.ChestShop;
import com.Acrobot.ChestShop.UUIDs.NameManager;
import com.Acrobot.ChestShop.UUIDs.PlayerDTO;
/** /**
* @author Acrobot * @author Acrobot
@ -24,8 +22,8 @@ public class PlayerConnect implements Listener {
Bukkit.getScheduler().runTaskAsynchronously(ChestShop.getPlugin(), new Runnable() { Bukkit.getScheduler().runTaskAsynchronously(ChestShop.getPlugin(), new Runnable() {
@Override @Override
public void run() { public void run() {
String playerName = NameUtil.stripUsername(playerDTO.getName()); // String playerName = NameUtil.stripUsername(playerDTO.getName());
UUID uuid = NameManager.getUUID(playerName); // UUID uuid = NameManager.getUUID(playerName);
NameManager.storeUsername(playerDTO); NameManager.storeUsername(playerDTO);
} }

5
src/main/java/com/Acrobot/ChestShop/Listeners/Player/PlayerInteract.java
View File

@ -118,8 +118,11 @@ public class PlayerInteract implements Listener {
String material = sign.getLine(ITEM_LINE); String material = sign.getLine(ITEM_LINE);
String ownerName = NameManager.getFullUsername(name); String ownerName = NameManager.getFullUsername(name);
UUID uuid = NameManager.getUUID(ownerName); if (ownerName == null || ownerName.isEmpty()) {
return null;
}
UUID uuid = NameManager.getUUID(ownerName);
if (uuid == null) { if (uuid == null) {
return null; return null;
} }

4
src/main/java/com/Acrobot/ChestShop/Listeners/ShopRemoval/ShopRefundListener.java
View File

@ -32,6 +32,10 @@ public class ShopRefundListener implements Listener {
} }
String ownerName = NameManager.getFullUsername(event.getSign().getLine(NAME_LINE)); String ownerName = NameManager.getFullUsername(event.getSign().getLine(NAME_LINE));
if (ownerName.isEmpty()) {
return;
}
UUID owner = NameManager.getUUID(ownerName); UUID owner = NameManager.getUUID(ownerName);
CurrencyAddEvent currencyEvent = new CurrencyAddEvent(BigDecimal.valueOf(refundPrice), owner, event.getSign().getWorld()); CurrencyAddEvent currencyEvent = new CurrencyAddEvent(BigDecimal.valueOf(refundPrice), owner, event.getSign().getWorld());

6
src/main/java/com/Acrobot/ChestShop/UUIDs/NameManager.java
View File

@ -9,6 +9,8 @@ import com.Acrobot.ChestShop.Signs.ChestShopSign;
import com.google.common.collect.BiMap; import com.google.common.collect.BiMap;
import com.google.common.collect.HashBiMap; import com.google.common.collect.HashBiMap;
import com.j256.ormlite.dao.Dao; import com.j256.ormlite.dao.Dao;
import org.apache.commons.lang.Validate;
import org.bukkit.Bukkit; import org.bukkit.Bukkit;
import org.bukkit.OfflinePlayer; import org.bukkit.OfflinePlayer;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;
@ -72,6 +74,8 @@ public class NameManager {
} }
public static UUID getUUID(String username) { public static UUID getUUID(String username) {
Validate.notEmpty(username, "user cannot be null or empty!");
if (usernameToUUID.containsKey(username)) { if (usernameToUUID.containsKey(username)) {
return usernameToUUID.get(username); return usernameToUUID.get(username);
} }
@ -241,7 +245,7 @@ public class NameManager {
return false; return false;
} }
return shortenedName.equals(name) || Permission.otherName(player, name) || player.getUniqueId().equals(getUUID(name)); return shortenedName.equals(name) || Permission.otherName(player, name) || (!name.isEmpty() && player.getUniqueId().equals(getUUID(name)));
} }
public static boolean isAdminShop(UUID uuid) { public static boolean isAdminShop(UUID uuid) {