minster586/OpenInv
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 36 Wiki Activity

Plugin update #25

Merged
ShadowRanger merged 2 commits from master into master 2015-06-22 04:56:48 -04:00
Conversation 9 Commits 2 Files Changed 122 +737 -11497
122 changed files with 737 additions and 11497 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit d988becf1f - Show all commits

22
src/main/java/com/lishid/openinv/commands/OpenEnderPluginCommand.java
View File

@@ -34,7 +34,7 @@ import com.lishid.openinv.utils.UUIDUtil;
public class OpenEnderPluginCommand implements CommandExecutor {
private final OpenInv plugin;
public static final Map<UUID, UUID> openEnderHistory = new ConcurrentHashMap<UUID, UUID>();
private final Map<UUID, UUID> openEnderHistory = new ConcurrentHashMap<UUID, UUID>();
public OpenEnderPluginCommand(OpenInv plugin) {
this.plugin = plugin;
@@ -49,7 +49,7 @@ public class OpenEnderPluginCommand implements CommandExecutor {
}
if (!OpenInv.hasPermission(sender, Permissions.PERM_ENDERCHEST)) {
sender.sendMessage(ChatColor.RED + "You do not have permission to access player enderchest");
sender.sendMessage(ChatColor.RED + "You do not have permission to access player enderchests.");
return true;
}
@@ -58,7 +58,7 @@ public class OpenEnderPluginCommand implements CommandExecutor {
return true;
}
Player player = (Player) sender;
final Player player = (Player) sender;
// History management
UUID history = openEnderHistory.get(player.getUniqueId());
@@ -85,21 +85,25 @@ public class OpenEnderPluginCommand implements CommandExecutor {
}
final UUID playerUUID = player.getUniqueId();
Player target = Bukkit.getPlayer(uuid);
// Targeted player was not found online, start asynchron lookup in files
if (target == null) {
sender.sendMessage(ChatColor.GREEN + "Starting inventory lookup.");
plugin.getServer().getScheduler().runTaskAsynchronously(plugin, new Runnable() {
// Targeted player was not found online, start asynchronous lookup in files
Bukkit.getScheduler().runTaskAsynchronously(plugin, new Runnable() {
@Override
public void run() {
// Try loading the player's data asynchronly
// Try loading the player's data asynchronously
final Player target = OpenInv.playerLoader.loadPlayer(uuid);
// Back to synchron to send messages and display inventory
if (target == null) {
player.sendMessage(ChatColor.RED + "Player not found!");
return;
}
// Open target's inventory synchronously
Bukkit.getScheduler().runTask(plugin, new Runnable() {
@Override
public void run() {
Player player = Bukkit.getPlayer(playerUUID);
// If sender is no longer online after loading the target. Abort!
// If sender is no longer online after loading the target, abort!
if (player == null) {
return;
}

22
src/main/java/com/lishid/openinv/commands/OpenInvPluginCommand.java
View File

@@ -34,7 +34,7 @@ import com.lishid.openinv.utils.UUIDUtil;
public class OpenInvPluginCommand implements CommandExecutor {
private final OpenInv plugin;
public static final Map<UUID, UUID> openInvHistory = new ConcurrentHashMap<UUID, UUID>();
private final Map<UUID, UUID> openInvHistory = new ConcurrentHashMap<UUID, UUID>();
public OpenInvPluginCommand(OpenInv plugin) {
this.plugin = plugin;
@@ -48,7 +48,7 @@ public class OpenInvPluginCommand implements CommandExecutor {
return true;
}
if (!OpenInv.hasPermission(sender, Permissions.PERM_OPENINV)) {
sender.sendMessage(ChatColor.RED + "You do not have permission to access player inventories");
sender.sendMessage(ChatColor.RED + "You do not have permission to access player inventories.");
return true;
}
@@ -57,7 +57,7 @@ public class OpenInvPluginCommand implements CommandExecutor {
return true;
}
Player player = (Player) sender;
final Player player = (Player) sender;
// History management
UUID history = openInvHistory.get(player.getUniqueId());
@@ -78,21 +78,25 @@ public class OpenInvPluginCommand implements CommandExecutor {
}
final UUID playerUUID = player.getUniqueId();
Player target = Bukkit.getPlayer(uuid);
// Targeted player was not found online, start asynchron lookup in files
if (target == null) {
sender.sendMessage(ChatColor.GREEN + "Starting inventory lookup.");
plugin.getServer().getScheduler().runTaskAsynchronously(plugin, new Runnable() {
// Targeted player was not found online, start asynchronous lookup in files
Bukkit.getScheduler().runTaskAsynchronously(plugin, new Runnable() {
@Override
public void run() {
// Try loading the player's data asynchronly
// Try loading the player's data asynchronously
final Player target = OpenInv.playerLoader.loadPlayer(uuid);
// Back to synchron to send messages and display inventory
if (target == null) {
player.sendMessage(ChatColor.RED + "Player not found!");
return;
}
// Open target's inventory synchronously
Bukkit.getScheduler().runTask(plugin, new Runnable() {
@Override
public void run() {
Player player = Bukkit.getPlayer(playerUUID);
// If sender is no longer online after loading the target. Abort!
// If sender is no longer online after loading the target, abort!
if (player == null) {
return;
}

2
src/main/java/com/lishid/openinv/internal/PlayerDataManager.java
View File

@@ -34,7 +34,7 @@ public class PlayerDataManager {
public Player loadPlayer(UUID uuid) {
try {
OfflinePlayer player = Bukkit.getOfflinePlayer(uuid);
if (player == null) {
if (player == null || !player.hasPlayedBefore()) {
return null;
}
GameProfile profile = new GameProfile(uuid, player.getName());

2
src/main/java/com/lishid/openinv/internal/SpecialPlayerInventory.java
View File

@@ -32,7 +32,7 @@ public class SpecialPlayerInventory extends PlayerInventory {
private CraftPlayer owner;
private boolean playerOnline = false;
public SpecialPlayerInventory(Player p, Boolean online) {
public SpecialPlayerInventory(Player p, boolean online) {
super(((CraftPlayer) p).getHandle());
this.owner = (CraftPlayer) p;
this.items = player.inventory.items;