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

Merge branch 'master' into dev

Browse Source 
# Conflicts:
#	pom.xml
This commit is contained in:
GeorgH93 2020-08-14 21:59:13 +02:00
commit 54ad23d040
No known key found for this signature in database
GPG Key ID: D1630D37F9E4B3C8
2 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Minepacks/src/at/pcgamingfreaks/Minepacks/Bukkit/Command/InventoryClearCommand.java
View File

@ -17,8 +17,8 @@
package at.pcgamingfreaks.Minepacks.Bukkit.Command;
import at.pcgamingfreaks.Bukkit.Command.RegisterablePluginCommand;
import at.pcgamingfreaks.Bukkit.Message.Message;
import at.pcgamingfreaks.Bukkit.RegisterablePluginCommand;
import at.pcgamingfreaks.Bukkit.Util.Utils;
import at.pcgamingfreaks.Minepacks.Bukkit.API.Events.InventoryClearEvent;
import at.pcgamingfreaks.Minepacks.Bukkit.API.Events.InventoryClearedEvent;
@ -72,14 +72,13 @@ private void clearInventory(Player player, CommandSender sender)
if(sender.equals(player))
{
messageOwnInventoryCleared.send(player);
Bukkit.getPluginManager().callEvent(new InventoryClearedEvent(player, sender));
}
else
{
messageInventoryWasCleared.send(player, sender.getName(), (sender instanceof Player) ? ((Player) sender).getDisplayName() : ChatColor.GRAY + sender.getName());
messageOtherInventoryCleared.send(sender, player.getName(), player.getDisplayName());
Bukkit.getPluginManager().callEvent(new InventoryClearedEvent(player, sender));
}
Bukkit.getPluginManager().callEvent(new InventoryClearedEvent(player, sender));
}
@Override

2
Minepacks/src/at/pcgamingfreaks/Minepacks/Bukkit/Minepacks.java
View File

@ -122,7 +122,7 @@ public void onEnable()
private boolean checkMcVersion()
{
if(MCVersion.is(MCVersion.UNKNOWN) || !MCVersion.isUUIDsSupportAvailable() || MCVersion.isNewerThan(MCVersion.MC_NMS_1_16_R1))
if(MCVersion.is(MCVersion.UNKNOWN) || !MCVersion.isUUIDsSupportAvailable() || MCVersion.isNewerThan(MCVersion.MC_NMS_1_16_R2))
{
this.warnOnVersionIncompatibility();
this.setEnabled(false);