Upstream/ChestShop-3
1
0
Fork 0
mirror of https://github.com/ChestShop-authors/ChestShop-3.git synced 2024-11-23 18:45:31 +01:00
Code Issues Projects Releases Wiki Activity

UUID changes

Browse Source
This commit is contained in:
Andrzej Pomirski 2014-04-12 14:22:34 +02:00
parent 4107b10f4b
commit b37ae0fbc4
6 changed files with 24 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/main/java/com/Acrobot/ChestShop/Events/Protection/ProtectBlockEvent.java
View File

@ -1,6 +1,7 @@
package com.Acrobot.ChestShop.Events.Protection; package com.Acrobot.ChestShop.Events.Protection;
import org.bukkit.block.Block; import org.bukkit.block.Block;
import org.bukkit.entity.Player;
import org.bukkit.event.Event; import org.bukkit.event.Event;
import org.bukkit.event.HandlerList; import org.bukkit.event.HandlerList;
@ -11,14 +12,14 @@ import org.bukkit.event.HandlerList;
public class ProtectBlockEvent extends Event { public class ProtectBlockEvent extends Event {
private static final HandlerList handlers = new HandlerList(); private static final HandlerList handlers = new HandlerList();
private Player player;
private Block block; private Block block;
private String name;
boolean isProtected = false; boolean isProtected = false;
public ProtectBlockEvent(Block block, String name) { public ProtectBlockEvent(Block block, Player player) {
this.block = block; this.block = block;
this.name = name; this.player = player;
} }
public boolean isProtected() { public boolean isProtected() {
@ -33,8 +34,8 @@ public class ProtectBlockEvent extends Event {
return block; return block;
} }
public String getName() { public Player getPlayer() {
return name; return player;
} }
public HandlerList getHandlers() { public HandlerList getHandlers() {

5
src/main/java/com/Acrobot/ChestShop/Listeners/PostTransaction/TransactionLogger.java
View File

@ -6,6 +6,7 @@ import com.Acrobot.ChestShop.Configuration.Properties;
import com.Acrobot.ChestShop.DB.Queue; import com.Acrobot.ChestShop.DB.Queue;
import com.Acrobot.ChestShop.DB.Transaction; import com.Acrobot.ChestShop.DB.Transaction;
import com.Acrobot.ChestShop.Events.TransactionEvent; import com.Acrobot.ChestShop.Events.TransactionEvent;
import com.Acrobot.ChestShop.UUIDs.NameManager;
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;
@ -63,8 +64,8 @@ public class TransactionLogger implements Listener {
transaction.setPrice((float) pricePerStack); transaction.setPrice((float) pricePerStack);
transaction.setShopOwner(event.getOwner().getName()); transaction.setShopOwner(NameManager.getUsername(event.getOwner().getUniqueId()));
transaction.setShopUser(event.getClient().getName()); transaction.setShopUser(NameManager.getUsername(event.getClient().getUniqueId()));
transaction.setSec(System.currentTimeMillis() / 1000); transaction.setSec(System.currentTimeMillis() / 1000);
transaction.setBuy(event.getTransactionType() == BUY); transaction.setBuy(event.getTransactionType() == BUY);

11
src/main/java/com/Acrobot/ChestShop/Listeners/PostTransaction/TransactionMessageSender.java
View File

@ -15,6 +15,8 @@ import org.bukkit.event.EventPriority;
import org.bukkit.event.Listener; import org.bukkit.event.Listener;
import org.bukkit.inventory.ItemStack; import org.bukkit.inventory.ItemStack;
import java.util.UUID;
/** /**
* @author Acrobot * @author Acrobot
*/ */
@ -30,7 +32,7 @@ public class TransactionMessageSender implements Listener {
protected static void sendBuyMessage(TransactionEvent event) { protected static void sendBuyMessage(TransactionEvent event) {
String itemName = parseItemInformation(event.getStock()); String itemName = parseItemInformation(event.getStock());
String owner = event.getOwner().getName(); String owner = NameManager.getUsername(event.getOwner().getUniqueId());
Player player = event.getClient(); Player player = event.getClient();
@ -53,7 +55,7 @@ public class TransactionMessageSender implements Listener {
protected static void sendSellMessage(TransactionEvent event) { protected static void sendSellMessage(TransactionEvent event) {
String itemName = parseItemInformation(event.getStock()); String itemName = parseItemInformation(event.getStock());
String owner = event.getOwner().getName(); String owner = NameManager.getUsername(event.getOwner().getUniqueId());
Player player = event.getClient(); Player player = event.getClient();
@ -88,10 +90,9 @@ public class TransactionMessageSender implements Listener {
} }
private static void sendMessageToOwner(String message, TransactionEvent event) { private static void sendMessageToOwner(String message, TransactionEvent event) {
String owner = event.getOwner().getName(); UUID owner = event.getOwner().getUniqueId();
owner = NameManager.getFullUsername(owner);
Player player = Bukkit.getPlayerExact(owner); Player player = Bukkit.getPlayer(owner);
if (player != null) { if (player != null) {
player.sendMessage(message); player.sendMessage(message);

9
src/main/java/com/Acrobot/ChestShop/Plugins/LightweightChestProtection.java
View File

@ -7,6 +7,7 @@ import com.Acrobot.ChestShop.Events.Protection.ProtectionCheckEvent;
import com.Acrobot.ChestShop.Events.ShopCreatedEvent; import com.Acrobot.ChestShop.Events.ShopCreatedEvent;
import com.Acrobot.ChestShop.Events.ShopDestroyedEvent; import com.Acrobot.ChestShop.Events.ShopDestroyedEvent;
import com.Acrobot.ChestShop.Security; import com.Acrobot.ChestShop.Security;
import com.Acrobot.ChestShop.UUIDs.NameManager;
import com.griefcraft.lwc.LWC; import com.griefcraft.lwc.LWC;
import com.griefcraft.model.Protection; import com.griefcraft.model.Protection;
import com.griefcraft.scripting.event.LWCProtectionRegisterEvent; import com.griefcraft.scripting.event.LWCProtectionRegisterEvent;
@ -36,12 +37,12 @@ public class LightweightChestProtection implements Listener {
Chest connectedChest = event.getChest(); Chest connectedChest = event.getChest();
if (Properties.PROTECT_SIGN_WITH_LWC) { if (Properties.PROTECT_SIGN_WITH_LWC) {
if (!Security.protect(player.getName(), sign.getBlock())) { if (!Security.protect(player, sign.getBlock())) {
player.sendMessage(Messages.prefix(Messages.NOT_ENOUGH_PROTECTIONS)); player.sendMessage(Messages.prefix(Messages.NOT_ENOUGH_PROTECTIONS));
} }
} }
if (Properties.PROTECT_CHEST_WITH_LWC && connectedChest != null && Security.protect(player.getName(), connectedChest.getBlock())) { if (Properties.PROTECT_CHEST_WITH_LWC && connectedChest != null && Security.protect(player, connectedChest.getBlock())) {
player.sendMessage(Messages.prefix(Messages.PROTECTED_SHOP)); player.sendMessage(Messages.prefix(Messages.PROTECTED_SHOP));
} }
} }
@ -73,7 +74,7 @@ public class LightweightChestProtection implements Listener {
} }
Block block = event.getBlock(); Block block = event.getBlock();
Player player = Bukkit.getPlayerExact(event.getName()); Player player = event.getPlayer();
if (player == null) { if (player == null) {
return; return;
@ -99,7 +100,7 @@ public class LightweightChestProtection implements Listener {
return; return;
} }
Protection protection = lwc.getPhysicalDatabase().registerProtection(block.getTypeId(), Protection.Type.PRIVATE, worldName, event.getName(), "", x, y, z); Protection protection = lwc.getPhysicalDatabase().registerProtection(block.getTypeId(), Protection.Type.PRIVATE, worldName, player.getName(), "", x, y, z);
if (protection != null) { if (protection != null) {
event.setProtected(true); event.setProtected(true);

4
src/main/java/com/Acrobot/ChestShop/Security.java
View File

@ -20,8 +20,8 @@ public class Security {
private static final BlockFace[] SIGN_CONNECTION_FACES = {BlockFace.UP, BlockFace.EAST, BlockFace.WEST, BlockFace.NORTH, BlockFace.SOUTH}; private static final BlockFace[] SIGN_CONNECTION_FACES = {BlockFace.UP, BlockFace.EAST, BlockFace.WEST, BlockFace.NORTH, BlockFace.SOUTH};
private static final BlockFace[] BLOCKS_AROUND = {BlockFace.UP, BlockFace.DOWN, BlockFace.EAST, BlockFace.WEST, BlockFace.NORTH, BlockFace.SOUTH}; private static final BlockFace[] BLOCKS_AROUND = {BlockFace.UP, BlockFace.DOWN, BlockFace.EAST, BlockFace.WEST, BlockFace.NORTH, BlockFace.SOUTH};
public static boolean protect(String playerName, Block block) { public static boolean protect(Player player, Block block) {
ProtectBlockEvent event = new ProtectBlockEvent(block, playerName); ProtectBlockEvent event = new ProtectBlockEvent(block, player);
ChestShop.callEvent(event); ChestShop.callEvent(event);
return event.isProtected(); return event.isProtected();

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

@ -54,7 +54,7 @@ public class NameManager {
} }
if (account == null) { if (account == null) {
return null; return "";
} }
return account.getName(); return account.getName();
@ -118,7 +118,7 @@ public class NameManager {
connection = new JdbcConnectionSource(uri); connection = new JdbcConnectionSource(uri);
accounts = DaoManager.createDao(connection, Account.class); accounts = DaoManager.createDao(connection, Account.class);
TableUtils.createTable(connection, Account.class); TableUtils.createTableIfNotExists(connection, Account.class);
} catch (SQLException e) { } catch (SQLException e) {
e.printStackTrace(); e.printStackTrace();
} }