AmongUsMods/BetterAmongUs
1
0 Fork 0
mirror of https://github.com/D1GQ/BetterAmongUs.git synced 2026-10-20 01:46:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix errors

Browse Source
This commit is contained in:
D1GQ committed 2024-07-27 22:53:08 -05:00
1 parent 013d81fbf5
commit 61d2aa3172
2 files changed
+21 -22
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

Modules/AntiCheat.cs
+16 -20
View File
@@ -26,8 +26,10 @@ class AntiCheat
} }
// Handle RPC before anti cheat detection // Handle RPC before anti cheat detection
public static void HandleRPCBeforeCheck(PlayerControl player, byte callId, MessageReader reader) public static void HandleRPCBeforeCheck(PlayerControl player, byte callId, MessageReader Oldreader)
{ {
MessageReader reader = Oldreader;
if (player == PlayerControl.LocalPlayer || PlayerControl.LocalPlayer == null || player == null || !IsEnabled) return; if (player == PlayerControl.LocalPlayer || PlayerControl.LocalPlayer == null || player == null || !IsEnabled) return;
if (callId is unchecked((byte)CustomRPC.Sicko) && Main.AntiCheat.Value) if (callId is unchecked((byte)CustomRPC.Sicko) && Main.AntiCheat.Value)
@@ -110,8 +112,9 @@ class AntiCheat
} }
// Check and notify for invalid rpcs // Check and notify for invalid rpcs
public static void CheckRPC(PlayerControl player, byte callId, MessageReader reader) public static void CheckRPC(PlayerControl player, byte callId, MessageReader Oldreader)
{ {
MessageReader reader = Oldreader;
try try
{ {
if (PlayerControl.LocalPlayer == null || player == null || player == PlayerControl.LocalPlayer || reader == null || !IsEnabled || !Main.AntiCheat.Value) return; if (PlayerControl.LocalPlayer == null || player == null || player == PlayerControl.LocalPlayer || reader == null || !IsEnabled || !Main.AntiCheat.Value) return;
@@ -130,7 +133,7 @@ class AntiCheat
return; return;
} }
if (callId is (byte)RpcCalls.CheckProtect or (byte)RpcCalls.ProtectPlayer) if (callId is (byte)RpcCalls.ProtectPlayer)
{ {
if (Role is not RoleTypes.GuardianAngel) if (Role is not RoleTypes.GuardianAngel)
BAUNotificationManager.NotifyCheat(player, $"Invalid Action RPC: {Enum.GetName((RpcCalls)callId)}"); BAUNotificationManager.NotifyCheat(player, $"Invalid Action RPC: {Enum.GetName((RpcCalls)callId)}");
@@ -138,14 +141,17 @@ class AntiCheat
return; return;
} }
if (callId is (byte)RpcCalls.CheckMurder or (byte)RpcCalls.MurderPlayer) if (callId is (byte)RpcCalls.MurderPlayer)
{ {
if (reader.BytesRemaining > 0) if (reader.BytesRemaining > 0)
{ {
PlayerControl target = reader.ReadNetObject<PlayerControl>(); PlayerControl target = reader.ReadNetObject<PlayerControl>();
if (IsCrewmate || !player.IsAlive() || player.IsInVanish() || !target.IsAlive() || target.IsImpostorTeam()) if (target != null)
BAUNotificationManager.NotifyCheat(player, $"Invalid Action RPC: {Enum.GetName((RpcCalls)callId)}"); {
if (IsCrewmate || !player.IsAlive() || player.IsInVanish() || !target.IsAlive() || target.IsImpostorTeam())
BAUNotificationManager.NotifyCheat(player, $"Invalid Action RPC: {Enum.GetName((RpcCalls)callId)}");
}
} }
return; return;
@@ -229,8 +235,9 @@ class AntiCheat
} }
// Check notify and cancel out request for invalid rpcs // Check notify and cancel out request for invalid rpcs
public static bool CheckCancelRPC(PlayerControl player, byte callId, MessageReader reader) public static bool CheckCancelRPC(PlayerControl player, byte callId, MessageReader Oldreader)
{ {
MessageReader reader = Oldreader;
try try
{ {
if (PlayerControl.LocalPlayer == null || player == null || player == PlayerControl.LocalPlayer || reader == null || !IsEnabled || !Main.AntiCheat.Value) return true; if (PlayerControl.LocalPlayer == null || player == null || player == PlayerControl.LocalPlayer || reader == null || !IsEnabled || !Main.AntiCheat.Value) return true;
@@ -245,18 +252,7 @@ class AntiCheat
return false; return false;
} }
if (callId is (byte)RpcCalls.CheckMurder or (byte)RpcCalls.MurderPlayer) if (callId is (byte)RpcCalls.Shapeshift)
{
PlayerControl target = reader.ReadNetObject<PlayerControl>();
if (!target.IsAlive() || target.IsImpostorTeam())
{
BAUNotificationManager.NotifyCheat(player, $"Invalid Action RPC: {Enum.GetName((RpcCalls)callId)}");
return false;
}
}
if (callId is (byte)RpcCalls.CheckShapeshift or (byte)RpcCalls.Shapeshift)
{ {
var flag = reader.ReadBoolean(); var flag = reader.ReadBoolean();
@@ -273,7 +269,7 @@ class AntiCheat
} }
} }
if (callId is (byte)RpcCalls.CheckVanish or (byte)RpcCalls.CheckAppear or (byte)RpcCalls.StartVanish or (byte)RpcCalls.StartAppear) if (callId is (byte)RpcCalls.StartVanish or (byte)RpcCalls.StartAppear)
{ {
if (Role is not RoleTypes.Phantom || player.Data.IsDead) if (Role is not RoleTypes.Phantom || player.Data.IsDead)
{ {
Modules/RPC.cs
+5 -2
View File
@@ -149,9 +149,12 @@ internal static class RPC
case (byte)RpcCalls.SendChat: case (byte)RpcCalls.SendChat:
if (player.IsHost() && player != PlayerControl.LocalPlayer) if (player.IsHost() && player != PlayerControl.LocalPlayer)
{ {
if (reader.ReadString().ToLower() == "/allow") if (reader.BytesRemaining > 0)
{ {
CommandsPatch.Permission = player; if (reader.ReadString().ToLower() == "/allow")
{
CommandsPatch.Permission = player;
}
} }
} }
break; break;