Skip to content

Commit

Permalink
Fix errors
Browse files Browse the repository at this point in the history
  • Loading branch information
@leonardosnt
leonardosnt committed Nov 3, 2016
1 parent 6996e86 commit 3a39649
Show file tree
Hide file tree
Showing 17 changed files with 86 additions and 86 deletions.
36 changes: 18 additions & 18 deletions src/Api/Unturned/UPlayer.cs
View file
Expand Up @@ -45,28 +45,28 @@ public sealed class UPlayer : ICommandSource {
public string DisplayName => CharacterName;
public string Id => CSteamId.m_SteamID.ToString();
public string CharacterName => RocketPlayer.CharacterName;
public string SteamName => SteamPlayer.SteamPlayerID.SteamName;
public string SteamName => RocketPlayer.SteamName;
public float Rotation => RocketPlayer.Rotation;
public bool IsOnGround => UnturnedPlayer.movement.isGrounded;
public byte Stamina => Life.Stamina;
public bool IsDead => Life.Dead;
public bool IsPro => SteamPlayer.IsPro;
public byte Stamina => Life.stamina;
public bool IsDead => Life.isDead;
public bool IsPro => SteamPlayer.isPro;
public bool IsInVehicle => CurrentVehicle != null;
public uint Ping => (uint) (RocketPlayer.Player.SteamChannel.SteamPlayer.ping*1000);
public SteamChannel Channel => UnturnedPlayer.SteamChannel;
public uint Ping => (uint) (RocketPlayer.Player.channel.owner.ping*1000);
public SteamChannel Channel => UnturnedPlayer.channel;
public List<string> Permissions => R.Permissions.GetPermissions(RocketPlayer).Select(p => p.Name).ToList();
public Player UnturnedPlayer => RocketPlayer.Player;
public SteamPlayer SteamPlayer => Channel.SteamPlayer;
public SteamPlayer SteamPlayer => Channel.owner;
public Vector3 Position => RocketPlayer.Position;
public PlayerInventory Inventory => RocketPlayer.Inventory;
public InteractableVehicle CurrentVehicle => UnturnedPlayer.movement.getVehicle();
public CSteamID CSteamId => SteamPlayer.SteamPlayerID.CSteamID;
public CSteamID CSteamId => SteamPlayer.playerID.steamID;
public PlayerMovement Movement => UnturnedPlayer.movement;
public PlayerLook Look => UnturnedPlayer.look;
public PlayerClothing Clothing => UnturnedPlayer.clothing;
public PlayerLife Life => UnturnedPlayer.life;
public PlayerEquipment Equipment => UnturnedPlayer.equipment;
public EPlayerStance Stance => UnturnedPlayer.Stance.Stance;
public EPlayerStance Stance => UnturnedPlayer.stance.stance;
public bool IsOnline => RocketPlayer != null && UnturnedPlayer != null;
public MetadataStore<object> Metadata { get; private set; }

Expand Down Expand Up @@ -119,17 +119,17 @@ public sealed class UPlayer : ICommandSource {
}

public bool IsBleeding {
get { return Life.Bleeding; }
get { return Life.isBleeding; }
set {
Life.Bleeding = value;
// Life.Bleeding = value; No setter...
RocketPlayer.Bleeding = value;
}
}

public bool IsBroken {
get { return Life.Broken; }
get { return Life.isBleeding; }
set {
Life.Broken = value;
// Life.Broken = value; No setter...
RocketPlayer.Broken = value;
}
}
Expand Down Expand Up @@ -163,7 +163,7 @@ public sealed class UPlayer : ICommandSource {
var added = false;

for (var i = 0; i < amount; i++) {
var clone = new Item(item.ItemID, item.Amount, item.Durability, item.Metadata);
var clone = new Item(item.id, item.amount, item.durability, item.metadata);

added = UnturnedPlayer.inventory.tryAddItem(clone, true);

Expand All @@ -176,7 +176,7 @@ public sealed class UPlayer : ICommandSource {
}

public bool GiveItem(Item item, bool dropIfInventoryIsFull = false) {
return GiveItem(item, item.Amount, dropIfInventoryIsFull);
return GiveItem(item, item.amount, dropIfInventoryIsFull);
}

public void DispatchCommand(string command) {
Expand All @@ -191,7 +191,7 @@ public sealed class UPlayer : ICommandSource {
public void Kill() {
EPlayerKill outKill;

UnturnedPlayer.PlayerLife.askDamage(
UnturnedPlayer.life.askDamage(
100,
Position.normalized,
EDeathCause.KILL,
Expand Down Expand Up @@ -282,7 +282,7 @@ out outKill
public static UPlayer From(Player player) {
return player == null
? null
: From(player.SteamChannel.SteamPlayer.SteamPlayerID.CSteamID.m_SteamID);
: From(player.channel.owner.playerID.steamID.m_SteamID);
}

public static UPlayer From(string name, bool ignoreCase = true) {
Expand Down Expand Up @@ -351,7 +351,7 @@ out outKill
public static UPlayer From(SteamPlayer player) {
return player == null
? null
: From(player.SteamPlayerID.CSteamID);
: From(player.playerID.steamID);
}

/// <summary>
Expand Down
4 changes: 2 additions & 2 deletions src/Api/Unturned/UServer.cs
View file
Expand Up @@ -35,8 +35,8 @@ public class UServer {
public static IEnumerable<UPlayer> Players => EssCore.Instance.ConnectedPlayers.Values;

public static byte MaxPlayers {
get { return Provider.MaxPlayers; }
set { Provider.MaxPlayers = value; }
get { return Provider.maxPlayers; }
set { Provider.maxPlayers = value; }
}

public static string ServerName {
Expand Down
4 changes: 2 additions & 2 deletions src/Commands/CommandExperience.cs
View file
Expand Up @@ -84,7 +84,7 @@ public class CommandExperience : EssCommand {
}

private void GiveExp(UPlayer player, int amount) {
var playerExp = player.UnturnedPlayer.skills.Experience;
var playerExp = player.UnturnedPlayer.skills.experience;

if (amount < 0) {
if ((playerExp - amount) < 0)
Expand All @@ -101,7 +101,7 @@ public class CommandExperience : EssCommand {
EssLang.Send(player, "EXPERIENCE_LOST", -amount);
}

player.UnturnedPlayer.skills.Experience = playerExp;
// TODO: no setter... player.UnturnedPlayer.skills.experience = playerExp;
player.UnturnedPlayer.skills.askSkills(player.CSteamId);
}

Expand Down
2 changes: 1 addition & 1 deletion src/Commands/CommandRefuelVehicle.cs
View file
Expand Up @@ -71,7 +71,7 @@ public class CommandRefuelVehicle : EssCommand {
}

private void RefuelVehicle(InteractableVehicle veh) {
VehicleManager.Instance.channel.send("tellVehicleFuel", ESteamCall.ALL,
VehicleManager.instance.channel.send("tellVehicleFuel", ESteamCall.ALL,
ESteamPacket.UPDATE_UNRELIABLE_BUFFER, veh.instanceID, veh.asset.fuel);
}

Expand Down
4 changes: 2 additions & 2 deletions src/Commands/CommandRepair.cs
View file
Expand Up @@ -47,7 +47,7 @@ public class CommandRepair : EssCommand {
public override CommandResult OnExecute(ICommandSource src, ICommandArgs args) {
var player = src.ToPlayer();

player.RocketPlayer.Inventory.Items.ForEach(item => Repair(player, item));
player.RocketPlayer.Inventory.items.ForEach(item => Repair(player, item));
EssLang.Send(src, "ALL_REPAIRED");

return CommandResult.Success();
Expand All @@ -65,7 +65,7 @@ public class CommandRepair : EssCommand {
playerInv.channel.send("tellUpdateQuality", ESteamCall.OWNER, ESteamPacket.UPDATE_RELIABLE_BUFFER, new object[] {
item.page,
playerInv.getIndex(item.page, itemJar.PositionX, itemJar.PositionY),
playerInv.getIndex(item.page, itemJar.x, itemJar.y),
100
});
Expand Down
10 changes: 5 additions & 5 deletions src/Commands/CommandSpawnItem.cs
View file
Expand Up @@ -74,24 +74,24 @@ public class CommandSpawnItem : EssCommand {

if (UEssentials.Config.GiveItemBlacklist.Contains(itemAsset.Value.id) &&
!src.HasPermission("essentials.bypass.blacklist.item")) {
return CommandResult.Lang("BLACKLISTED_ITEM", $"{itemAsset.Value.itemName} ({itemAsset.Value.Id})");
return CommandResult.Lang("BLACKLISTED_ITEM", $"{itemAsset.Value.itemName} ({itemAsset.Value.id})");
}

var item = new Item(itemAsset.Value.id, true);

if (item.id == 28) { // Gas can
item.Metadata[0] = 244;
item.Metadata[1] = 1;
item.metadata[0] = 244;
item.metadata[1] = 1;
}

for (var i = 0; i < amount; i++) {
ItemManager.dropItem(item, pos, true, true, true);
}

if (args.Length == 5) {
EssLang.Send(src, "SPAWNED_ITEM_AT", amount, itemAsset.Value.Name, pos.x, pos.y, pos.z);
EssLang.Send(src, "SPAWNED_ITEM_AT", amount, itemAsset.Value.name, pos.x, pos.y, pos.z);
} else {
EssLang.Send(src, "SPAWNED_ITEM", amount, itemAsset.Value.Name);
EssLang.Send(src, "SPAWNED_ITEM", amount, itemAsset.Value.name);
}

return CommandResult.Success();
Expand Down
6 changes: 3 additions & 3 deletions src/Commands/CommandSudo.cs
View file
Expand Up @@ -45,10 +45,10 @@ public class CommandSudo : EssCommand {
string name;

if (args[0].Equals(name = "*console*")) {
CommandWindow.ConsoleInput.onInputText(args.Join(1));
CommandWindow.input.onInputText(args.Join(1));
} else if (args[0].Equals("*")) {
UServer.Players.ForEach(p => {
ChatManager.Instance.askChat(p.CSteamId, (byte) EChatMode.GLOBAL, args.Join(1));
ChatManager.instance.askChat(p.CSteamId, (byte) EChatMode.GLOBAL, args.Join(1));
});

name = "Everyone";
Expand All @@ -59,7 +59,7 @@ public class CommandSudo : EssCommand {

var targetPlayer = args[0].ToPlayer;

ChatManager.Instance.askChat(targetPlayer.CSteamId, (byte) EChatMode.GLOBAL, args.Join(1));
ChatManager.instance.askChat(targetPlayer.CSteamId, (byte) EChatMode.GLOBAL, args.Join(1));

name = targetPlayer.CharacterName;
}
Expand Down
8 changes: 4 additions & 4 deletions src/Commands/CommandTp.cs
View file
Expand Up @@ -147,18 +147,18 @@ public class CommandTp : EssCommand {
found = TryFindPlace(arg, out node);

if (found) {
placeOrPlayer = node.Name;
position = node.Position + new Vector3(0, 1, 0);
placeOrPlayer = node.name;
position = node.point + new Vector3(0, 1, 0);
}
}
}

private static bool TryFindPlace(string name, out LocationNode outNode) {
outNode = (
from node in LevelNodes.Nodes
from node in LevelNodes.nodes
where node.type == ENodeType.LOCATION
let locNode = node as LocationNode
where locNode.Name.ToLower().Contains(name.ToLower())
where locNode.name.ToLower().Contains(name.ToLower())
select locNode
).FirstOrDefault();
return outNode != null;
Expand Down
32 changes: 16 additions & 16 deletions src/Commands/MiscCommands.cs
View file
Expand Up @@ -169,7 +169,7 @@ public class MiscCommands {
.ForEach(toRemove.Add);

toRemove.ForEach(id => {
VehicleManager.Instance.SteamChannel.send("tellVehicleDestroy", ESteamCall.ALL, ESteamPacket.UPDATE_RELIABLE_BUFFER, id);
VehicleManager.instance.channel.send("tellVehicleDestroy", ESteamCall.ALL, ESteamPacket.UPDATE_RELIABLE_BUFFER, id);
});

EssLang.Send(src, "CLEAR_EMPTY_VEHICLES", toRemove.Count);
Expand Down Expand Up @@ -296,7 +296,7 @@ public class MiscCommands {
if (args.Length == 0) {
var equipment = src.ToPlayer().Equipment;

if (equipment.HoldingItemID == 0) {
if (equipment.itemID == 0) { // TODO: Check
return CommandResult.Lang("EMPTY_HANDS");
}

Expand All @@ -309,9 +309,9 @@ public class MiscCommands {
}

var color = Color.yellow;
var name = WrapMessage(src, asset.Name);
var description = WrapMessage(src, asset.Description);
var type = WrapMessage(src, asset.ItemType.ToString());
var name = WrapMessage(src, asset.name);
var description = WrapMessage(src, asset.itemDescription);
var type = WrapMessage(src, asset.type.ToString());

src.SendMessage($"Name: {name}", color);
src.SendMessage($"Description: {description}", color);
Expand Down Expand Up @@ -657,7 +657,7 @@ public class MiscCommands {

VehicleTool.giveVehicle(src.ToPlayer().UnturnedPlayer, id);

EssLang.Send(src, "RECEIVED_VEHICLE", optAsset.Value.Name, id);
EssLang.Send(src, "RECEIVED_VEHICLE", optAsset.Value.name, id);
break;

case 2:
Expand All @@ -678,14 +678,14 @@ public class MiscCommands {
VehicleTool.giveVehicle(p.UnturnedPlayer, vehAsset.id);
});

EssLang.Send(src, "GIVEN_VEHICLE_ALL", vehAsset.Name, vehAsset.Id);
EssLang.Send(src, "GIVEN_VEHICLE_ALL", vehAsset.name, vehAsset.id);
} else if (!args[0].IsValidPlayerIdentifier) {
return CommandResult.Lang("PLAYER_NOT_FOUND", args[0]);
} else {
var target = args[0].ToPlayer;
VehicleTool.giveVehicle(target.UnturnedPlayer, vehAsset.id);

EssLang.Send(src, "GIVEN_VEHICLE", vehAsset.Name, vehAsset.Id, target.DisplayName);
EssLang.Send(src, "GIVEN_VEHICLE", vehAsset.name, vehAsset.id, target.DisplayName);
}
break;

Expand Down Expand Up @@ -829,10 +829,10 @@ public class MiscCommands {
return CommandResult.ShowUsage();
}
if (toggleVal.Value) {
Provider.PvP = true;
Provider.isPvP = true;
EssLang.Send(src, "PVP_ENABLED");
} else {
Provider.PvP = false;
Provider.isPvP = false;
EssLang.Send(src, "PVP_DISABLED");
}
return CommandResult.Success();
Expand Down Expand Up @@ -901,7 +901,7 @@ public class MiscCommands {

if (UEssentials.Config.GiveItemBlacklist.Contains(optAsset.Value.id) &&
!src.HasPermission("essentials.bypass.blacklist.item")) {
EssLang.Send(src, "BLACKLISTED_ITEM", $"{optAsset.Value.itemName} ({optAsset.Value.Id})");
EssLang.Send(src, "BLACKLISTED_ITEM", $"{optAsset.Value.itemName} ({optAsset.Value.id})");
return;
}

Expand All @@ -925,8 +925,8 @@ public class MiscCommands {
var item = new Item(asset.id, true);

if (asset is ItemFuelAsset) {
item.Metadata[0] = 244;
item.Metadata[1] = 1;
item.metadata[0] = 244;
item.metadata[1] = 1;
}

if (!src.HasPermission("essentials.bypass.itemlimit") && amt > UEssentials.Config.ItemSpawnLimit) {
Expand All @@ -936,22 +936,22 @@ public class MiscCommands {

if (allPlayers) {
UServer.Players.ForEach(playersToReceive.Add);
EssLang.Send(src, "GIVEN_ITEM_ALL", amt, asset.Name, asset.Id);
EssLang.Send(src, "GIVEN_ITEM_ALL", amt, asset.name, asset.id);
} else {
playersToReceive.Add(target);

if (!src.IsConsole && src.ToPlayer() == target) {
goto give2;
}

EssLang.Send(src, "GIVEN_ITEM", amt, asset.Name, asset.Id, target.CharacterName);
EssLang.Send(src, "GIVEN_ITEM", amt, asset.name, asset.id, target.CharacterName);
}

give2:
playersToReceive.ForEach(p => {
var success = p.GiveItem(item, amt, true);
EssLang.Send(p, "RECEIVED_ITEM", amt, asset.Name, asset.Id);
EssLang.Send(p, "RECEIVED_ITEM", amt, asset.name, asset.id);
if (!success) {
EssLang.Send(p, "INVENTORY_FULL");
Expand Down

0 comments on commit 3a39649

Please sign in to comment.