Skip to content

Commit d1e1fe0

Browse files
committed
fix(bump): Resolved any compile time issues related to BP version bump v1.3
1 parent 38e7de0 commit d1e1fe0

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

74 files changed

+222
-529
lines changed

dist/localization.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@
8787
"warn_remove_error_null_or_negative": "WarnId {0} cannot be negative or null.",
8888
"warn_remove_error_not_existent": "The Warn {0} does not exist",
8989
"player_warn_removed": "Removed the Warn {0}",
90-
"warn_toString": "{0} by {1} on {2} expiring after {3} days. {4}",
90+
"warn_toString": "{0} by {1} on {2} expiring after {3} days.",
9191
"command_disabled": "The Command {0} is disabled.",
9292
"command_failed_cuffed": "This Command cannot be used when cuffed!",
9393
"command_failed_jail": "This Command cannot be used when in jail!",

src/BPEssentials.sln

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,8 @@ VisualStudioVersion = 16.0.28917.182
55
MinimumVisualStudioVersion = 10.0.40219.1
66
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BPEssentials", "BPEssentials\BPEssentials.csproj", "{AFE6CE3D-2FE4-4C67-B71C-7DA67FA73766}"
77
EndProject
8+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BP-CoreLib", "..\..\BP-CoreLib\src\BP-CoreLib\BP-CoreLib.csproj", "{573A3947-382A-409B-95E6-176E8D5BC686}"
9+
EndProject
810
Global
911
GlobalSection(SolutionConfigurationPlatforms) = preSolution
1012
Debug|Any CPU = Debug|Any CPU
@@ -15,6 +17,10 @@ Global
1517
{AFE6CE3D-2FE4-4C67-B71C-7DA67FA73766}.Debug|Any CPU.Build.0 = Debug|Any CPU
1618
{AFE6CE3D-2FE4-4C67-B71C-7DA67FA73766}.Release|Any CPU.ActiveCfg = Release|Any CPU
1719
{AFE6CE3D-2FE4-4C67-B71C-7DA67FA73766}.Release|Any CPU.Build.0 = Release|Any CPU
20+
{573A3947-382A-409B-95E6-176E8D5BC686}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
21+
{573A3947-382A-409B-95E6-176E8D5BC686}.Debug|Any CPU.Build.0 = Debug|Any CPU
22+
{573A3947-382A-409B-95E6-176E8D5BC686}.Release|Any CPU.ActiveCfg = Release|Any CPU
23+
{573A3947-382A-409B-95E6-176E8D5BC686}.Release|Any CPU.Build.0 = Release|Any CPU
1824
EndGlobalSection
1925
GlobalSection(SolutionProperties) = preSolution
2026
HideSolutionNode = FALSE

src/BPEssentials/Abstractions/Command.cs renamed to src/BPEssentials/Abstractions/BpeCommand.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55

66
namespace BPEssentials.Abstractions
77
{
8-
public abstract class Command
8+
public abstract class BpeCommand
99
{
1010
public virtual bool LastArgSpaces { get; }
1111

src/BPEssentials/BPEssentials.csproj

Lines changed: 38 additions & 364 deletions
Large diffs are not rendered by default.

src/BPEssentials/ChatHandlers/GlobalChat.cs

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -18,15 +18,13 @@ public void OnEvent(ShPlayer player, string message)
1818
{
1919
return;
2020
}
21-
22-
if (player.GetExtendedPlayer().Muted)
21+
if (CommandHandler.OnEvent(player, message)) // 'true' if message starts with command prefix
2322
{
24-
player.TS("muted_player");
2523
return;
2624
}
27-
28-
if (CommandHandler.OnEvent(player, message)) // 'true' if message starts with command prefix
25+
if (player.GetExtendedPlayer().Muted)
2926
{
27+
player.TS("muted_player");
3028
return;
3129
}
3230

@@ -48,4 +46,4 @@ public void OnEvent(ShPlayer player, string message)
4846
}
4947
}
5048
}
51-
}
49+
}

src/BPEssentials/Commands/Chat/PmUser.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55

66
namespace BPEssentials.Commands
77
{
8-
public class PmUser : Command
8+
public class PmUser : BpeCommand
99
{
1010
public override bool LastArgSpaces => true;
1111

src/BPEssentials/Commands/Chat/ReplyUser.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55

66
namespace BPEssentials.Commands
77
{
8-
public class ReplyUser : Command
8+
public class ReplyUser : BpeCommand
99
{
1010
public override bool LastArgSpaces => true;
1111

src/BPEssentials/Commands/Chat/Sudo.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33

44
namespace BPEssentials.Commands
55
{
6-
public class Sudo : Command
6+
public class Sudo : BpeCommand
77
{
88
public void Invoke(ShPlayer player, ShPlayer target, string message)
99
{

src/BPEssentials/Commands/Chat/ToggleChat.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55

66
namespace BPEssentials.Commands
77
{
8-
public class ToggleChat : Command
8+
public class ToggleChat : BpeCommand
99
{
1010
public void Invoke(ShPlayer player)
1111
{

src/BPEssentials/Commands/Essentials.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55

66
namespace BPEssentials.Commands
77
{
8-
public class Essentials : Command
8+
public class Essentials : BpeCommand
99
{
1010
public override bool LastArgSpaces => true;
1111

0 commit comments

Comments
 (0)