Skip to content

Commit 370ad2a

Browse files
committed
Fix Several Issues
1 parent 87a0642 commit 370ad2a

12 files changed

Lines changed: 24 additions & 18 deletions

lib/Assembly-CSharp-firstpass.dll

73.5 KB
Binary file not shown.

lib/Assembly-CSharp.dll

88.5 KB
Binary file not shown.

lib/Newtonsoft.Json.dll

0 Bytes
Binary file not shown.

lib/Rocket.API.dll

512 Bytes
Binary file not shown.

lib/Rocket.Core.dll

3 KB
Binary file not shown.

lib/Rocket.Unturned.dll

-1.5 KB
Binary file not shown.

lib/UnityEngine.dll

-1.08 MB
Binary file not shown.

src/Commands/MiscCommands.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -828,13 +828,13 @@ private CommandResult RefuelGeneratorCommand(ICommandSource src, ICommandArgs ar
828828
}
829829

830830
var count = 0;
831-
var rayResult = Physics.SphereCastAll(position, radius, Vector3.forward, RayMasks.BARRICADE);
831+
var rayResult = Physics.SphereCastAll(position, radius, Vector3.forward, RayMasks.BARRICADE_INTERACT);
832832

833833
rayResult
834834
.Select(r => r.transform.GetComponent<InteractableGenerator>())
835835
.Where(r => r != null)
836836
.ForEach(r => {
837-
BarricadeManager.sendFuel(r.transform, (ushort) Math.Floor(r.capacity * percentage));
837+
BarricadeManager.sendFuel(r.transform, (ushort) System.Math.Floor(r.capacity * percentage));
838838
count++;
839839
});
840840

src/Common/Util/ItemUtil.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -207,7 +207,7 @@ public static void Refuel(byte[] metadata, ItemFuelAsset fuelAsset, float percen
207207
if (percentage > 100) percentage = 100;
208208
if (percentage < 0) percentage = 0;
209209

210-
var fuel = (int) Math.Floor((fuelAsset.fuel * (percentage / 100)));
210+
var fuel = (int) System.Math.Floor((fuelAsset.fuel * (percentage / 100)));
211211

212212
metadata[0] = (byte) fuel;
213213
metadata[1] = (byte) (fuel >> 8);

src/Components/Player/FrozenPlayer.cs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -36,15 +36,15 @@ private FrozenPlayer() {
3636

3737
if (!Player.IsInVehicle) return;
3838
var veh = Player.CurrentVehicle;
39-
var passagers = veh.passengers;
39+
var passengers = veh.passengers;
4040

41-
for (var i = 0; i < passagers.Length; i++) {
42-
if (passagers[i].player != Player.SteamPlayer) continue;
41+
for (var i = 0; i < passengers.Length; i++) {
42+
if (passengers[i].player != Player.SteamPlayer) continue;
4343

4444
var pos = Player.Position;
4545
var seat = (byte) i;
4646

47-
veh.getExit(seat, out var exitPoint, out var exitAngle);
47+
veh.forceRemovePlayer(out seat, passengers[i].player.playerID.steamID, out var exitPoint, out var exitAngle);
4848
VehicleManager.sendExitVehicle(veh, seat, (exitPoint + (exitPoint - pos)), exitAngle, false);
4949
}
5050
}

0 commit comments

Comments
 (0)