diff --git a/Content/Items/Dummy.cs b/Content/Items/Dummy.cs index ac989fce..16020b90 100644 --- a/Content/Items/Dummy.cs +++ b/Content/Items/Dummy.cs @@ -15,20 +15,8 @@ public override void SetDefaults() public override bool? UseItem(Player player) { - return base.UseItem(player); - } - public override bool AltFunctionUse(Player player) - { - return true; - } - public override bool CanUseItem(Player player) - { - /*if (Main.netMode == NetmodeID.MultiplayerClient) - { - AddNotification(GetText("Items.Dummy.CannotUse"), Color.PaleVioletRed * 1.4f); - return false; - }*/ if (Main.myPlayer != player.whoAmI) return false; + if (player.altFunctionUse == 2) { foreach (var npc in Main.npc) @@ -65,6 +53,19 @@ public override bool CanUseItem(Player player) return true; } + public override bool AltFunctionUse(Player player) + { + return true; + } + public override bool CanUseItem(Player player) + { + /*if (Main.netMode == NetmodeID.MultiplayerClient) + { + AddNotification(GetText("Items.Dummy.CannotUse"), Color.PaleVioletRed * 1.4f); + return false; + }*/ + return Main.myPlayer == player.whoAmI; + } public override void HoldStyle(Player player, Rectangle heldItemFrame) { if (Main.myPlayer != player.whoAmI) return; diff --git a/UIFramework/SUIElements/SUIText.cs b/UIFramework/SUIElements/SUIText.cs index f2eae7f4..70849316 100644 --- a/UIFramework/SUIElements/SUIText.cs +++ b/UIFramework/SUIElements/SUIText.cs @@ -250,7 +250,7 @@ public override void DrawSelf(SpriteBatch spriteBatch) var scale = new Vector2(TextScale); ChatManager.DrawColorCodedStringShadow(spriteBatch, Font, FinalTextSnippets - , textPos, TextColor, 0f, Vector2.Zero, scale, -1, TextBorder); + , textPos, TextBorderColor, 0f, Vector2.Zero, scale, -1, TextBorder); ChatManager.DrawColorCodedString(spriteBatch, Font, FinalTextSnippets, textPos, TextColor, 0f, Vector2.Zero, scale, out var _, -1f);