diff --git a/src/main/java/pvpmode/ChatUtils.java b/src/main/java/pvpmode/ChatUtils.java index d525dee..e6f92a3 100644 --- a/src/main/java/pvpmode/ChatUtils.java +++ b/src/main/java/pvpmode/ChatUtils.java @@ -74,7 +74,9 @@ public static void postLocalChatMessages (ICommandSender recipient, EnumChatForm } } if (root != null) + { recipient.addChatMessage (root); + } } } } @@ -134,7 +136,9 @@ public static void postGlobalChatMessages (EnumChatFormatting color, } } if (root != null) + { PvPMode.cfg.sendChatMsg (root); + } } } } diff --git a/src/main/java/pvpmode/PvPEventHandler.java b/src/main/java/pvpmode/PvPEventHandler.java index 105b033..5a10c24 100644 --- a/src/main/java/pvpmode/PvPEventHandler.java +++ b/src/main/java/pvpmode/PvPEventHandler.java @@ -17,7 +17,7 @@ import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.event.CommandEvent; import net.minecraftforge.event.entity.living.*; -import net.minecraftforge.event.entity.player.*; +import net.minecraftforge.event.entity.player.PlayerDropsEvent; import pvpmode.compatibility.events.*; import pvpmode.compatibility.events.PartialItemDropEvent.Drop.Action; import pvpmode.compatibility.events.PartialItemDropEvent.EnumInventory; @@ -531,14 +531,14 @@ public void onPartialItemLoss (PartialItemLossEvent event) event.setCanceled (PvPMode.soulboundItemsEnabled && PvPUtils.isSoulbound (event.getStack ())); } -// @SubscribeEvent -// public void onItemTooltip (ItemTooltipEvent event) -// { -// if (PvPUtils.isSoulbound (event.itemStack) && PvPMode.soulboundItemsEnabled) -// { -// event.toolTip.add (PvPMode.soulboundTooltip); -// } -// }TODO: clientside mod + // @SubscribeEvent + // public void onItemTooltip (ItemTooltipEvent event) + // { + // if (PvPUtils.isSoulbound (event.itemStack) && PvPMode.soulboundItemsEnabled) + // { + // event.toolTip.add (PvPMode.soulboundTooltip); + // } + // }TODO: clientside mod public static void init () { diff --git a/src/main/java/pvpmode/command/PvPCommandHelp.java b/src/main/java/pvpmode/command/PvPCommandHelp.java index b1df2ac..0fd0fee 100644 --- a/src/main/java/pvpmode/command/PvPCommandHelp.java +++ b/src/main/java/pvpmode/command/PvPCommandHelp.java @@ -71,7 +71,9 @@ public void processCommand (ICommandSender sender, String[] args) postShortCommandHelp (sender, PvPMode.pvpadminCommandInstance); postShortCommandHelp (sender, PvPMode.pvpconfigCommandInstance); if (PvPMode.soulboundItemsEnabled) + { postShortCommandHelp (sender, PvPMode.soulboundCommandInstance); + } ChatUtils.green (sender, "-------------------------"); } else @@ -181,7 +183,9 @@ public List addTabCompletionOptions (ICommandSender sender, String[] args) {"pvp", "pvpadmin", "pvplist", "pvphelp", "pvpconfig"}; if (PvPMode.soulboundItemsEnabled) + { commands = ArrayUtils.add (commands, "soulbound"); + } return getListOfStringsMatchingLastWord (args, commands); } return null;