Skip to content

Commit 48f67dd

Browse files
committed
Deprecate OnTeamPromote in favour of OnTeamMemberPromote
1 parent 3b47229 commit 48f67dd

2 files changed

Lines changed: 40 additions & 25 deletions

File tree

resources/Rust.opj

Lines changed: 24 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -5700,31 +5700,6 @@
57005700
"HookCategory": "Team"
57015701
}
57025702
},
5703-
{
5704-
"Type": "Simple",
5705-
"Hook": {
5706-
"InjectionIndex": 43,
5707-
"ReturnBehavior": 1,
5708-
"ArgumentBehavior": 4,
5709-
"ArgumentString": "l2, l1",
5710-
"HookTypeName": "Simple",
5711-
"Name": "OnTeamPromote",
5712-
"HookName": "OnTeamPromote",
5713-
"AssemblyName": "Assembly-CSharp.dll",
5714-
"TypeName": "RelationshipManager",
5715-
"Flagged": false,
5716-
"Signature": {
5717-
"Exposure": 2,
5718-
"Name": "promote",
5719-
"ReturnType": "System.Void",
5720-
"Parameters": [
5721-
"ConsoleSystem/Arg"
5722-
]
5723-
},
5724-
"MSILHash": "S9ziO6k9MgPxnVsMrfowLbIwZJT3FlCQMo3Tz1WRRFo=",
5725-
"HookCategory": "Team"
5726-
}
5727-
},
57285703
{
57295704
"Type": "Simple",
57305705
"Hook": {
@@ -21748,6 +21723,30 @@
2174821723
"MSILHash": "H0u/1o5sjtVrGGW4qMCzZ4voIYam5/ZJ5Vl/s3C72Uc=",
2174921724
"HookCategory": "Player"
2175021725
}
21726+
},
21727+
{
21728+
"Type": "Simple",
21729+
"Hook": {
21730+
"InjectionIndex": 0,
21731+
"ReturnBehavior": 4,
21732+
"ArgumentBehavior": 3,
21733+
"HookTypeName": "Simple",
21734+
"Name": "OnTeamMemberPromote",
21735+
"HookName": "OnTeamMemberPromote",
21736+
"AssemblyName": "Assembly-CSharp.dll",
21737+
"TypeName": "RelationshipManager/PlayerTeam",
21738+
"Flagged": false,
21739+
"Signature": {
21740+
"Exposure": 2,
21741+
"Name": "SetTeamLeader",
21742+
"ReturnType": "System.Void",
21743+
"Parameters": [
21744+
"System.UInt64"
21745+
]
21746+
},
21747+
"MSILHash": "EcPI4zi+gCOie868IwMDV9kvVqH4TzCv+FtDcPWVzX8=",
21748+
"HookCategory": "Team"
21749+
}
2175121750
}
2175221751
],
2175321752
"Modifiers": [

src/RustHooks.cs

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,8 @@ public partial class RustCore
2828
internal bool isPlayerTakingDamage;
2929
internal static string ipPattern = @":{1}[0-9]{1}\d*";
3030

31+
private static readonly DateTime Eoy = new DateTime(2025, 12, 31);
32+
3133
#region Entity Hooks
3234

3335
/// <summary>
@@ -689,5 +691,19 @@ private object IOnCupboardAuthorize(ulong userID, BasePlayer player, BuildingPri
689691
}
690692

691693
#endregion
694+
695+
#region Deprecated Hooks
696+
697+
[HookMethod("OnTeamMemberPromote")]
698+
private void OnTeamMemberPromote(RelationshipManager.PlayerTeam team, ulong newTeamLeader)
699+
{
700+
BasePlayer player = BasePlayer.FindByID(newTeamLeader);
701+
if (player != null)
702+
{
703+
Interface.Oxide.CallDeprecatedHook("OnTeamPromote", "OnTeamMemberPromote(PlayerTeam team, ulong userId)", Eoy, team, player);
704+
}
705+
}
706+
707+
#endregion
692708
}
693709
}

0 commit comments

Comments
 (0)