diff --git a/ReallifeGamemode.Client/util/attachmentMngr.ts b/ReallifeGamemode.Client/util/attachmentMngr.ts index c1a3dcc2..516cacb3 100644 --- a/ReallifeGamemode.Client/util/attachmentMngr.ts +++ b/ReallifeGamemode.Client/util/attachmentMngr.ts @@ -154,17 +154,6 @@ export default function attachmentManager(game: IGame) { } }); - mp.events.addDataHandler("attachToPlayer", (player: PlayerMp, attachedPlayer: PlayerMp) => { - if (!attachedPlayer) - return; - - let handle = player.handle; - if (player == mp.players.local) - handle = mp.players.local.handle; - - attachedPlayer.attachTo(handle, 0, 0, 1, 0, 0, 0, 0, false, true, false, true, 2, true); - }); - mp.events.addDataHandler("attachmentsData", (entity, data) => { let newAttachments = (data.length > 0) ? data.split('|').map(att => parseInt(att, 36)) : []; diff --git a/ReallifeGamemode.Server/Commands/AdminCommands.cs b/ReallifeGamemode.Server/Commands/AdminCommands.cs index 40a72c71..95bcca64 100644 --- a/ReallifeGamemode.Server/Commands/AdminCommands.cs +++ b/ReallifeGamemode.Server/Commands/AdminCommands.cs @@ -34,22 +34,6 @@ namespace ReallifeGamemode.Server.Commands { #region Todo - [Command("test_cuff1")] - public void TestCuff1(Player player, string nameOrId) - { - if (!player.GetUser()?.IsAdmin(AdminLevel.SUPPORTER) ?? true) - { - ChatService.NotAuthorized(player); - return; - } - Player target = PlayerService.GetPlayerByNameOrId(nameOrId); - if (target.Id == player.Id) - return; - //target.SetInFrontOf(player); - //target.Heading = player.Heading; - target.AttachPlayer(player); - } - [Command("cuff", "~m~Benutzung: ~s~/cuff [ID]")] public void CmdCuffTest(Player player, string nameOrId) { diff --git a/ReallifeGamemode.Server/Util/AttachmentSync.cs b/ReallifeGamemode.Server/Util/AttachmentSync.cs index 51f02de9..ba9322ea 100644 --- a/ReallifeGamemode.Server/Util/AttachmentSync.cs +++ b/ReallifeGamemode.Server/Util/AttachmentSync.cs @@ -108,29 +108,6 @@ public static class AttachmentSync { return string.Join('|', attachments.Select(a => Base36Extensions.ToBase36(a)).ToArray()); } - - public static void AttachPlayer(this Player player, Player attachTo) - { - attachTo.DetachPlayer(); - - if (!attachTo.HasData("attachedPlayer")) - attachTo.SetData("attachedPlayer", null); - - if (attachTo.GetData("attachedPlayer") == player) - return; - - attachTo.SetData("attachedPlayer", attachTo); - attachTo.SetSharedData("attachToPlayer", player); - } - - public static void DetachPlayer(this Player player) - { - if (!player.HasData("attachedPlayer")) - return; - - player.ResetData("attachedPlayer"); - player.ResetSharedData("attachToPlayer"); - } } public class AttachmentSyncExample : Script