mirror of
https://github.com/All-Of-Us-Mods/MiraAPI.git
synced 2026-10-20 01:46:15 +00:00
WTF GIT FAIL!
This commit is contained in:
1 parent
b04d9619b8
commit
a04e0d28db
1 file changed
+5
-10
@@ -1,26 +1,21 @@
|
||||
using HarmonyLib;
|
||||
using MiraAPI.Events;
|
||||
using MiraAPI.Events.Vanilla.Meeting;
|
||||
using MiraAPI.Utilities;
|
||||
|
||||
namespace MiraAPI.Patches.Events;
|
||||
|
||||
<<<<<<<< HEAD:MiraAPI/Patches/Events/ReportBodyEventPatch.cs
|
||||
[HarmonyPatch]
|
||||
public static class ReportBodyEventPatch
|
||||
========
|
||||
[HarmonyPatch(typeof(MeetingHud), nameof(MeetingHud.Start))]
|
||||
public static class StartMeetingEventPatch
|
||||
>>>>>>>> dev:MiraAPI/Patches/Events/StartMeetingEventPatch.cs
|
||||
{
|
||||
public static void Postfix(MeetingHud __instance)
|
||||
[HarmonyPrefix]
|
||||
[HarmonyPatch(typeof(PlayerControl), nameof(PlayerControl.CmdReportDeadBody))]
|
||||
public static bool PlayerControlCmdReportDeadBodyPrefix(PlayerControl __instance, NetworkedPlayerInfo? target)
|
||||
{
|
||||
<<<<<<<< HEAD:MiraAPI/Patches/Events/ReportBodyEventPatch.cs
|
||||
var body = target != null ? Helpers.GetBodyById(target.PlayerId) : null;
|
||||
|
||||
var @event = new ReportBodyEvent(__instance, target, body);
|
||||
========
|
||||
var @event = new StartMeetingEvent(__instance);
|
||||
>>>>>>>> dev:MiraAPI/Patches/Events/StartMeetingEventPatch.cs
|
||||
MiraEventManager.InvokeEvent(@event);
|
||||
return !@event.IsCancelled;
|
||||
}
|
||||
}
|
||||
Reference in new issue
Block a user