Skip to content

Commit 7997c0f

Browse files
committed
Patch for staging branch changes
1 parent 1ffd8e8 commit 7997c0f

File tree

2 files changed

+24
-26
lines changed

2 files changed

+24
-26
lines changed

resources/Rust.opj

+23-25
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"Name": "Rust",
3-
"TargetDirectory": "D:\\Servers\\Rust\\RustDedicated_Data\\Managed",
3+
"TargetDirectory": "D:\\Servers\\Rust-Staging\\RustDedicated_Data\\Managed",
44
"Manifests": [
55
{
66
"AssemblyName": "Assembly-CSharp.dll",
@@ -598,7 +598,7 @@
598598
"Network.Connection"
599599
]
600600
},
601-
"MSILHash": "JVcftTs45C7gds64n2r9FSnXhuJbxZ2wCMiuQYv9omk=",
601+
"MSILHash": "F7KZMZdzEuGwG+pDx9DEZCpomv/hmUqRzZ5ZjsIl2Mc=",
602602
"HookCategory": "Player"
603603
}
604604
},
@@ -2271,7 +2271,7 @@
22712271
"Network.Message"
22722272
]
22732273
},
2274-
"MSILHash": "WuZxEi77Sk058XHGAw1AvME2rBIcZ/1+pZL7QYCil1k=",
2274+
"MSILHash": "NeEs34zp+awltfpoa0t9yaXjp26LEz65hRDwOKaKxlE=",
22752275
"HookCategory": "Player"
22762276
}
22772277
},
@@ -2297,7 +2297,7 @@
22972297
"System.Boolean"
22982298
]
22992299
},
2300-
"MSILHash": "57miQ0y78g0zwThdxu8FiPCR4m49/F3M16ge/F9DfIY=",
2300+
"MSILHash": "fKWRTKuIqmKmyVlzVYBfjKpEAhzwb1jmegd1sbAzoas=",
23012301
"HookCategory": "Server"
23022302
}
23032303
},
@@ -2345,7 +2345,7 @@
23452345
"System.Boolean"
23462346
]
23472347
},
2348-
"MSILHash": "57miQ0y78g0zwThdxu8FiPCR4m49/F3M16ge/F9DfIY=",
2348+
"MSILHash": "fKWRTKuIqmKmyVlzVYBfjKpEAhzwb1jmegd1sbAzoas=",
23492349
"BaseHookName": "OnNewSave",
23502350
"HookCategory": "Server"
23512351
}
@@ -3452,7 +3452,7 @@
34523452
"BaseEntity/RPCMessage"
34533453
]
34543454
},
3455-
"MSILHash": "TnnP1F2Ac1oBaCQLqt4Kc7y07GZEGEsns2DC6xVaTu4=",
3455+
"MSILHash": "skGBcXYPMD3tHljp7yfzO80noXmFXiEgNr5Ti895VCo=",
34563456
"HookCategory": "Item"
34573457
}
34583458
},
@@ -4253,7 +4253,7 @@
42534253
"BasePlayer"
42544254
]
42554255
},
4256-
"MSILHash": "aSELiG+SxA/J5ToapbJK5/mk4F31uCIXLBUhgjx7Yog=",
4256+
"MSILHash": "ptDCdbtNZDPdOemnJ83qb85rpSjDi7y1lV/TRbNV+P0=",
42574257
"HookCategory": "Vehicle"
42584258
}
42594259
},
@@ -4279,14 +4279,14 @@
42794279
"System.Boolean"
42804280
]
42814281
},
4282-
"MSILHash": "0xNV2LI0VepVHu0GnGMqscaHOkDYI7rWyeMVN9Mqfxw=",
4282+
"MSILHash": "Bh0QZ3iLuh/1jAl+vr0CkCSk6jDY3bI+sopmbKvz+xE=",
42834283
"HookCategory": "Player"
42844284
}
42854285
},
42864286
{
42874287
"Type": "Simple",
42884288
"Hook": {
4289-
"InjectionIndex": 249,
4289+
"InjectionIndex": 250,
42904290
"ReturnBehavior": 0,
42914291
"ArgumentBehavior": 4,
42924292
"ArgumentString": "this, a0",
@@ -4305,7 +4305,7 @@
43054305
"System.Boolean"
43064306
]
43074307
},
4308-
"MSILHash": "0xNV2LI0VepVHu0GnGMqscaHOkDYI7rWyeMVN9Mqfxw=",
4308+
"MSILHash": "Bh0QZ3iLuh/1jAl+vr0CkCSk6jDY3bI+sopmbKvz+xE=",
43094309
"BaseHookName": "CanDismountEntity",
43104310
"HookCategory": "Entity"
43114311
}
@@ -4332,7 +4332,7 @@
43324332
"System.Boolean"
43334333
]
43344334
},
4335-
"MSILHash": "0xNV2LI0VepVHu0GnGMqscaHOkDYI7rWyeMVN9Mqfxw=",
4335+
"MSILHash": "Bh0QZ3iLuh/1jAl+vr0CkCSk6jDY3bI+sopmbKvz+xE=",
43364336
"BaseHookName": "OnEntityDismounted",
43374337
"HookCategory": "Entity"
43384338
}
@@ -12938,7 +12938,7 @@
1293812938
"MarketTerminal"
1293912939
]
1294012940
},
12941-
"MSILHash": "g+oVxBsTmJnlS9NPCLvGzsCKkKBrPJcFakETgpTyn7E=",
12941+
"MSILHash": "ndwNJQwGa0Qh/0Vd7s2N5MThy0Nm2LUacyeLCE89OD0=",
1294212942
"HookCategory": "Vending"
1294312943
}
1294412944
},
@@ -15288,7 +15288,7 @@
1528815288
{
1528915289
"Type": "Simple",
1529015290
"Hook": {
15291-
"InjectionIndex": 309,
15291+
"InjectionIndex": 313,
1529215292
"ReturnBehavior": 4,
1529315293
"ArgumentBehavior": 4,
1529415294
"ArgumentString": "a0, l13, a5, this, a3",
@@ -15312,7 +15312,7 @@
1531215312
"MarketTerminal"
1531315313
]
1531415314
},
15315-
"MSILHash": "g+oVxBsTmJnlS9NPCLvGzsCKkKBrPJcFakETgpTyn7E=",
15315+
"MSILHash": "ndwNJQwGa0Qh/0Vd7s2N5MThy0Nm2LUacyeLCE89OD0=",
1531615316
"BaseHookName": "OnVendingTransaction",
1531715317
"HookCategory": "Vending"
1531815318
}
@@ -16545,7 +16545,7 @@
1654516545
"ReturnType": "System.Void",
1654616546
"Parameters": []
1654716547
},
16548-
"MSILHash": "SGcuqfLnIDp4wNwPVupSOplS8ZJ2on0OCNL6wkwl5m0=",
16548+
"MSILHash": "jRAcAwn10lleUEr0ZTpi95DlcoRxcvSl6Y0PDMCjrz0=",
1654916549
"HookCategory": "Server"
1655016550
}
1655116551
},
@@ -18093,7 +18093,7 @@
1809318093
{
1809418094
"Type": "Simple",
1809518095
"Hook": {
18096-
"InjectionIndex": 93,
18096+
"InjectionIndex": 96,
1809718097
"ReturnBehavior": 0,
1809818098
"ArgumentBehavior": 4,
1809918099
"ArgumentString": "this, l0, l1, l2",
@@ -18111,7 +18111,7 @@
1811118111
"BaseEntity/RPCMessage"
1811218112
]
1811318113
},
18114-
"MSILHash": "mHj/92FDQK1Z4K410p5cuKfI9Y09AuexUlv6y6T6brI=",
18114+
"MSILHash": "lzmyca+k404MEOHDol4FDWqeWKRAO3SydB22kS181XI=",
1811518115
"HookCategory": "Player"
1811618116
}
1811718117
},
@@ -18135,7 +18135,7 @@
1813518135
"BaseEntity/RPCMessage"
1813618136
]
1813718137
},
18138-
"MSILHash": "mHj/92FDQK1Z4K410p5cuKfI9Y09AuexUlv6y6T6brI=",
18138+
"MSILHash": "lzmyca+k404MEOHDol4FDWqeWKRAO3SydB22kS181XI=",
1813918139
"BaseHookName": "OnFeedbackReported",
1814018140
"HookCategory": "_Patches"
1814118141
}
@@ -20569,7 +20569,7 @@
2056920569
"PatrolHelicopterAI/DangerZone"
2057020570
]
2057120571
},
20572-
"MSILHash": "wk7xpRxw5gIkEHd/62RuxuvQEzW22ra2GCzKk1wtewk=",
20572+
"MSILHash": "G6vVdp7/0VlqxC9l58hGM2daCJaamDQ4jPttP+ipTUE=",
2057320573
"HookCategory": "Entity"
2057420574
}
2057520575
},
@@ -20902,7 +20902,7 @@
2090220902
{
2090320903
"Type": "Simple",
2090420904
"Hook": {
20905-
"InjectionIndex": 13,
20905+
"InjectionIndex": 8,
2090620906
"ReturnBehavior": 1,
2090720907
"ArgumentBehavior": 4,
2090820908
"ArgumentString": "a0, this.owner, this",
@@ -20920,7 +20920,7 @@
2092020920
"BasePlayer"
2092120921
]
2092220922
},
20923-
"MSILHash": "05Q1TBojJhwG/faYe33UR6LwOSut+xgSu3ArhnErlFY=",
20923+
"MSILHash": "4urDwFpJ/rEqFX838xOiS6LDZDEXqUBHtovDPDZLIaM=",
2092420924
"HookCategory": "Vehicle"
2092520925
}
2092620926
},
@@ -21276,10 +21276,9 @@
2127621276
{
2127721277
"Type": "Simple",
2127821278
"Hook": {
21279-
"InjectionIndex": 65,
21279+
"InjectionIndex": 60,
2128021280
"ReturnBehavior": 1,
2128121281
"ArgumentBehavior": 3,
21282-
"ArgumentString": null,
2128321282
"HookTypeName": "Simple",
2128421283
"Name": "IOnNpcTarget [SenseComponent]",
2128521284
"HookName": "IOnNpcTarget",
@@ -21294,8 +21293,7 @@
2129421293
"BaseEntity"
2129521294
]
2129621295
},
21297-
"MSILHash": "1IFiFqiPi/UAOwFf2XHRsTyhryQEa4oAooUITmm0s6k=",
21298-
"BaseHookName": null,
21296+
"MSILHash": "OkFJrQ9LYT3D8s4ksfwOnKUgGi2cOF/Osy25gmAUqDc=",
2129921297
"HookCategory": "NPC"
2130021298
}
2130121299
},

src/Oxide.Rust.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
<TargetFramework>net48</TargetFramework>
1515
<GeneratePackageOnBuild>True</GeneratePackageOnBuild>
1616
<SteamAppId>258550</SteamAppId>
17-
<SteamBranch>public</SteamBranch>
17+
<SteamBranch>staging</SteamBranch>
1818
<SteamLogin>anonymous</SteamLogin>
1919
<GamePlatform>windows;linux</GamePlatform>
2020
<GameExe>RustDedicated.exe;RustDedicated</GameExe>

0 commit comments

Comments
 (0)