Upstream/Minepacks
1
0
Fork 0
mirror of https://github.com/GeorgH93/Minepacks.git synced 2025-02-13 01:12:43 +01:00
Code Issues Packages Projects Releases Wiki Activity

More fixes for MC 1.20.1

Browse Source
This commit is contained in:
GeorgH93 2023-07-14 22:38:19 +02:00
parent 5e24997f93
commit cf7a6c0617
No known key found for this signature in database
GPG Key ID: D1630D37F9E4B3C8
3 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Minepacks-API/src/at/pcgamingfreaks/Minepacks/Bukkit/API/Backpack.java
View File

@ -47,6 +47,8 @@ public interface Backpack extends InventoryHolder
*/ */
UUID getOwnerId(); UUID getOwnerId();
@Nullable Player getOwnerPlayer();
/** /**
* Let a given player open this backpack. * Let a given player open this backpack.
* *

6
Minepacks/src/at/pcgamingfreaks/Minepacks/Bukkit/Backpack.java
View File

@ -119,6 +119,12 @@ public Backpack(final OfflinePlayer owner, ItemStack[] backpack, final int ID)
return Bukkit.getServer().getOfflinePlayer(ownerId); return Bukkit.getServer().getOfflinePlayer(ownerId);
} }
@Override
public @Nullable Player getOwnerPlayer()
{
return Bukkit.getServer().getPlayer(ownerId);
}
private void checkResize() private void checkResize()
{ {
Player owner = Bukkit.getServer().getPlayer(this.ownerId); Player owner = Bukkit.getServer().getPlayer(this.ownerId);

6
Minepacks/src/at/pcgamingfreaks/Minepacks/Bukkit/Command/ClearCommand.java
View File

@ -69,15 +69,15 @@ public void onResult(Backpack backpack)
if(backpack != null) if(backpack != null)
{ {
backpack.clear(); backpack.clear();
if(commandSender.equals(backpack.getOwner())) if(commandSender instanceof Player && ((Player) commandSender).getUniqueId().equals(backpack.getOwnerId()))
{ {
messageCleared.send(commandSender); messageCleared.send(commandSender);
} }
else else
{ {
if(backpack.getOwner().isOnline()) Player owner = backpack.getOwnerPlayer();
if(owner != null)
{ {
Player owner = backpack.getOwner().getPlayer();
messageClearedOther.send(commandSender, owner); messageClearedOther.send(commandSender, owner);
messageClearedBy.send(owner, commandSender); messageClearedBy.send(owner, commandSender);
} }