From 8d5cdf04a8a7df92fecd4748a8a8bae5aeb41d96 Mon Sep 17 00:00:00 2001 From: Lucas Nicodemus Date: Tue, 24 Apr 2012 12:45:46 -0600 Subject: [PATCH 1/3] Update copyright to reflect actual year date. --- DBEditor/CommandList.cs | 2 +- DBEditor/DbExt.cs | 2 +- DBEditor/Group.cs | 2 +- DBEditor/Itemlist.cs | 2 +- DBEditor/Main.Designer.cs | 2 +- DBEditor/Main.cs | 2 +- DBEditor/Program.cs | 2 +- DBEditor/Properties/AssemblyInfo.cs | 2 +- DBEditor/Properties/Resources.Designer.cs | 2 +- DBEditor/Properties/Settings.Designer.cs | 2 +- DBEditor/TShockDBEditor.licenseheader | 2 +- TShockAPI/BackupManager.cs | 2 +- TShockAPI/Commands.cs | 2 +- TShockAPI/ConfigFile.cs | 2 +- TShockAPI/DB/BanManager.cs | 2 +- TShockAPI/DB/GroupManager.cs | 2 +- TShockAPI/DB/IQueryBuilder.cs | 2 +- TShockAPI/DB/InventoryManager.cs | 2 +- TShockAPI/DB/ItemManager.cs | 2 +- TShockAPI/DB/RegionManager.cs | 2 +- TShockAPI/DB/RememberPosManager.cs | 2 +- TShockAPI/DB/SqlColumn.cs | 2 +- TShockAPI/DB/SqlTable.cs | 2 +- TShockAPI/DB/SqlValue.cs | 2 +- TShockAPI/DB/UserManager.cs | 2 +- TShockAPI/DB/WarpsManager.cs | 2 +- TShockAPI/Extensions/DbExt.cs | 2 +- TShockAPI/Extensions/LinqExt.cs | 2 +- TShockAPI/Extensions/RandomExt.cs | 2 +- TShockAPI/Extensions/StringExt.cs | 2 +- TShockAPI/FileTools.cs | 2 +- TShockAPI/GeoIPCountry.cs | 2 +- TShockAPI/GetDataHandlers.cs | 2 +- TShockAPI/Group.cs | 2 +- TShockAPI/HandlerList.cs | 2 +- TShockAPI/IPackable.cs | 2 +- TShockAPI/Log.cs | 2 +- TShockAPI/Net/BaseMsg.cs | 2 +- TShockAPI/Net/DisconnectMsg.cs | 2 +- TShockAPI/Net/NetTile.cs | 2 +- TShockAPI/Net/ProjectileRemoveMsg.cs | 2 +- TShockAPI/Net/SpawnMsg.cs | 2 +- TShockAPI/Net/WorldInfoMsg.cs | 2 +- TShockAPI/PacketBufferer.cs | 2 +- TShockAPI/Permissions.cs | 2 +- TShockAPI/Properties/AssemblyInfo.cs | 2 +- TShockAPI/RconHandler.cs | 2 +- TShockAPI/Resources.Designer.cs | 2 +- TShockAPI/Rest/Rest.cs | 2 +- TShockAPI/Rest/RestCommand.cs | 2 +- TShockAPI/Rest/RestManager.cs | 2 +- TShockAPI/Rest/RestObject.cs | 2 +- TShockAPI/Rest/RestVerbs.cs | 2 +- TShockAPI/Rest/SecureRest.cs | 2 +- TShockAPI/StatTracker.cs | 2 +- TShockAPI/TSPlayer.cs | 2 +- TShockAPI/TShock.cs | 2 +- TShockAPI/TShockAPI.licenseheader | 2 +- TShockAPI/UpdateManager.cs | 2 +- TShockAPI/Utils.cs | 2 +- UnitTests/BanManagerTest.cs | 2 +- UnitTests/GroupManagerTest.cs | 2 +- UnitTests/ItemManagerTest.cs | 2 +- UnitTests/Properties/AssemblyInfo.cs | 2 +- UnitTests/RegionManagerTest.cs | 2 +- UnitTests/UnitTests.licenseheader | 2 +- 66 files changed, 66 insertions(+), 66 deletions(-) diff --git a/DBEditor/CommandList.cs b/DBEditor/CommandList.cs index 50fd8003..c49c067c 100644 --- a/DBEditor/CommandList.cs +++ b/DBEditor/CommandList.cs @@ -1,6 +1,6 @@ /* TShock, a server mod for Terraria -Copyright (C) 2011 The TShock Team +Copyright (C) 2011-2012 The TShock Team This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/DBEditor/DbExt.cs b/DBEditor/DbExt.cs index 112d5161..226a8971 100644 --- a/DBEditor/DbExt.cs +++ b/DBEditor/DbExt.cs @@ -1,6 +1,6 @@ /* TShock, a server mod for Terraria -Copyright (C) 2011 The TShock Team +Copyright (C) 2011-2012 The TShock Team This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/DBEditor/Group.cs b/DBEditor/Group.cs index 8dd3f44e..581b90ca 100644 --- a/DBEditor/Group.cs +++ b/DBEditor/Group.cs @@ -1,6 +1,6 @@ /* TShock, a server mod for Terraria -Copyright (C) 2011 The TShock Team +Copyright (C) 2011-2012 The TShock Team This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/DBEditor/Itemlist.cs b/DBEditor/Itemlist.cs index f73a51f8..e3372fd8 100644 --- a/DBEditor/Itemlist.cs +++ b/DBEditor/Itemlist.cs @@ -1,6 +1,6 @@ /* TShock, a server mod for Terraria -Copyright (C) 2011 The TShock Team +Copyright (C) 2011-2012 The TShock Team This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/DBEditor/Main.Designer.cs b/DBEditor/Main.Designer.cs index 38128155..a5824913 100644 --- a/DBEditor/Main.Designer.cs +++ b/DBEditor/Main.Designer.cs @@ -1,6 +1,6 @@ /* TShock, a server mod for Terraria -Copyright (C) 2011 The TShock Team +Copyright (C) 2011-2012 The TShock Team This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/DBEditor/Main.cs b/DBEditor/Main.cs index b0afd2ed..81d21f04 100644 --- a/DBEditor/Main.cs +++ b/DBEditor/Main.cs @@ -1,6 +1,6 @@ /* TShock, a server mod for Terraria -Copyright (C) 2011 The TShock Team +Copyright (C) 2011-2012 The TShock Team This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/DBEditor/Program.cs b/DBEditor/Program.cs index 87c58708..e0f7ef00 100644 --- a/DBEditor/Program.cs +++ b/DBEditor/Program.cs @@ -1,6 +1,6 @@ /* TShock, a server mod for Terraria -Copyright (C) 2011 The TShock Team +Copyright (C) 2011-2012 The TShock Team This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/DBEditor/Properties/AssemblyInfo.cs b/DBEditor/Properties/AssemblyInfo.cs index c8be0e19..80567a20 100644 --- a/DBEditor/Properties/AssemblyInfo.cs +++ b/DBEditor/Properties/AssemblyInfo.cs @@ -1,6 +1,6 @@ /* TShock, a server mod for Terraria -Copyright (C) 2011 The TShock Team +Copyright (C) 2011-2012 The TShock Team This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/DBEditor/Properties/Resources.Designer.cs b/DBEditor/Properties/Resources.Designer.cs index 2ec43f10..ef2100a0 100644 --- a/DBEditor/Properties/Resources.Designer.cs +++ b/DBEditor/Properties/Resources.Designer.cs @@ -1,6 +1,6 @@ /* TShock, a server mod for Terraria -Copyright (C) 2011 The TShock Team +Copyright (C) 2011-2012 The TShock Team This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/DBEditor/Properties/Settings.Designer.cs b/DBEditor/Properties/Settings.Designer.cs index d6ca6768..0288467b 100644 --- a/DBEditor/Properties/Settings.Designer.cs +++ b/DBEditor/Properties/Settings.Designer.cs @@ -1,6 +1,6 @@ /* TShock, a server mod for Terraria -Copyright (C) 2011 The TShock Team +Copyright (C) 2011-2012 The TShock Team This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/DBEditor/TShockDBEditor.licenseheader b/DBEditor/TShockDBEditor.licenseheader index 32579142..12ed0ea9 100644 --- a/DBEditor/TShockDBEditor.licenseheader +++ b/DBEditor/TShockDBEditor.licenseheader @@ -1,7 +1,7 @@ extensions: .cs /* TShock, a server mod for Terraria -Copyright (C) 2011 The TShock Team +Copyright (C) 2011-2012 The TShock Team This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/TShockAPI/BackupManager.cs b/TShockAPI/BackupManager.cs index b871c6c1..bb51336e 100644 --- a/TShockAPI/BackupManager.cs +++ b/TShockAPI/BackupManager.cs @@ -1,6 +1,6 @@ /* TShock, a server mod for Terraria -Copyright (C) 2011 The TShock Team +Copyright (C) 2011-2012 The TShock Team This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/TShockAPI/Commands.cs b/TShockAPI/Commands.cs index 3f80922b..f5378e7a 100755 --- a/TShockAPI/Commands.cs +++ b/TShockAPI/Commands.cs @@ -1,6 +1,6 @@ /* TShock, a server mod for Terraria -Copyright (C) 2011 The TShock Team +Copyright (C) 2011-2012 The TShock Team This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/TShockAPI/ConfigFile.cs b/TShockAPI/ConfigFile.cs index e9c4b2df..07edeb0a 100644 --- a/TShockAPI/ConfigFile.cs +++ b/TShockAPI/ConfigFile.cs @@ -1,6 +1,6 @@ /* TShock, a server mod for Terraria -Copyright (C) 2011 The TShock Team +Copyright (C) 2011-2012 The TShock Team This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/TShockAPI/DB/BanManager.cs b/TShockAPI/DB/BanManager.cs index d00e8264..7ace1584 100644 --- a/TShockAPI/DB/BanManager.cs +++ b/TShockAPI/DB/BanManager.cs @@ -1,6 +1,6 @@ /* TShock, a server mod for Terraria -Copyright (C) 2011 The TShock Team +Copyright (C) 2011-2012 The TShock Team This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/TShockAPI/DB/GroupManager.cs b/TShockAPI/DB/GroupManager.cs index 573f7ac7..de3f0db4 100644 --- a/TShockAPI/DB/GroupManager.cs +++ b/TShockAPI/DB/GroupManager.cs @@ -1,6 +1,6 @@ /* TShock, a server mod for Terraria -Copyright (C) 2011 The TShock Team +Copyright (C) 2011-2012 The TShock Team This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/TShockAPI/DB/IQueryBuilder.cs b/TShockAPI/DB/IQueryBuilder.cs index b5f84105..2d4a8662 100644 --- a/TShockAPI/DB/IQueryBuilder.cs +++ b/TShockAPI/DB/IQueryBuilder.cs @@ -1,6 +1,6 @@ /* TShock, a server mod for Terraria -Copyright (C) 2011 The TShock Team +Copyright (C) 2011-2012 The TShock Team This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/TShockAPI/DB/InventoryManager.cs b/TShockAPI/DB/InventoryManager.cs index 65b192bc..92f8a6bf 100644 --- a/TShockAPI/DB/InventoryManager.cs +++ b/TShockAPI/DB/InventoryManager.cs @@ -1,6 +1,6 @@ /* TShock, a server mod for Terraria -Copyright (C) 2011 The TShock Team +Copyright (C) 2011-2012 The TShock Team This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/TShockAPI/DB/ItemManager.cs b/TShockAPI/DB/ItemManager.cs index 0ab9a539..6ef11b6b 100644 --- a/TShockAPI/DB/ItemManager.cs +++ b/TShockAPI/DB/ItemManager.cs @@ -1,6 +1,6 @@ /* TShock, a server mod for Terraria -Copyright (C) 2011 The TShock Team +Copyright (C) 2011-2012 The TShock Team This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/TShockAPI/DB/RegionManager.cs b/TShockAPI/DB/RegionManager.cs index be9e20c8..b3eef5fe 100644 --- a/TShockAPI/DB/RegionManager.cs +++ b/TShockAPI/DB/RegionManager.cs @@ -1,6 +1,6 @@ /* TShock, a server mod for Terraria -Copyright (C) 2011 The TShock Team +Copyright (C) 2011-2012 The TShock Team This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/TShockAPI/DB/RememberPosManager.cs b/TShockAPI/DB/RememberPosManager.cs index d7485511..ee06db63 100644 --- a/TShockAPI/DB/RememberPosManager.cs +++ b/TShockAPI/DB/RememberPosManager.cs @@ -1,6 +1,6 @@ /* TShock, a server mod for Terraria -Copyright (C) 2011 The TShock Team +Copyright (C) 2011-2012 The TShock Team This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/TShockAPI/DB/SqlColumn.cs b/TShockAPI/DB/SqlColumn.cs index 75860f79..efc94649 100644 --- a/TShockAPI/DB/SqlColumn.cs +++ b/TShockAPI/DB/SqlColumn.cs @@ -1,6 +1,6 @@ /* TShock, a server mod for Terraria -Copyright (C) 2011 The TShock Team +Copyright (C) 2011-2012 The TShock Team This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/TShockAPI/DB/SqlTable.cs b/TShockAPI/DB/SqlTable.cs index ce3b527a..0b4024c6 100644 --- a/TShockAPI/DB/SqlTable.cs +++ b/TShockAPI/DB/SqlTable.cs @@ -1,6 +1,6 @@ /* TShock, a server mod for Terraria -Copyright (C) 2011 The TShock Team +Copyright (C) 2011-2012 The TShock Team This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/TShockAPI/DB/SqlValue.cs b/TShockAPI/DB/SqlValue.cs index 35f998b6..0efd78bf 100644 --- a/TShockAPI/DB/SqlValue.cs +++ b/TShockAPI/DB/SqlValue.cs @@ -1,6 +1,6 @@ /* TShock, a server mod for Terraria -Copyright (C) 2011 The TShock Team +Copyright (C) 2011-2012 The TShock Team This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/TShockAPI/DB/UserManager.cs b/TShockAPI/DB/UserManager.cs index 68ade122..db360518 100644 --- a/TShockAPI/DB/UserManager.cs +++ b/TShockAPI/DB/UserManager.cs @@ -1,6 +1,6 @@ /* TShock, a server mod for Terraria -Copyright (C) 2011 The TShock Team +Copyright (C) 2011-2012 The TShock Team This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/TShockAPI/DB/WarpsManager.cs b/TShockAPI/DB/WarpsManager.cs index 1627a15c..67d1afe8 100644 --- a/TShockAPI/DB/WarpsManager.cs +++ b/TShockAPI/DB/WarpsManager.cs @@ -1,6 +1,6 @@ /* TShock, a server mod for Terraria -Copyright (C) 2011 The TShock Team +Copyright (C) 2011-2012 The TShock Team This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/TShockAPI/Extensions/DbExt.cs b/TShockAPI/Extensions/DbExt.cs index 4cc774d0..42bcc6f1 100644 --- a/TShockAPI/Extensions/DbExt.cs +++ b/TShockAPI/Extensions/DbExt.cs @@ -1,6 +1,6 @@ /* TShock, a server mod for Terraria -Copyright (C) 2011 The TShock Team +Copyright (C) 2011-2012 The TShock Team This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/TShockAPI/Extensions/LinqExt.cs b/TShockAPI/Extensions/LinqExt.cs index 15b26fbf..25d06b7e 100644 --- a/TShockAPI/Extensions/LinqExt.cs +++ b/TShockAPI/Extensions/LinqExt.cs @@ -1,6 +1,6 @@ /* TShock, a server mod for Terraria -Copyright (C) 2011 The TShock Team +Copyright (C) 2011-2012 The TShock Team This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/TShockAPI/Extensions/RandomExt.cs b/TShockAPI/Extensions/RandomExt.cs index 1c702af2..2e4d2681 100644 --- a/TShockAPI/Extensions/RandomExt.cs +++ b/TShockAPI/Extensions/RandomExt.cs @@ -1,6 +1,6 @@ /* TShock, a server mod for Terraria -Copyright (C) 2011 The TShock Team +Copyright (C) 2011-2012 The TShock Team This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/TShockAPI/Extensions/StringExt.cs b/TShockAPI/Extensions/StringExt.cs index 95f3f20c..e70be35b 100644 --- a/TShockAPI/Extensions/StringExt.cs +++ b/TShockAPI/Extensions/StringExt.cs @@ -1,6 +1,6 @@ /* TShock, a server mod for Terraria -Copyright (C) 2011 The TShock Team +Copyright (C) 2011-2012 The TShock Team This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/TShockAPI/FileTools.cs b/TShockAPI/FileTools.cs index ac4dfd31..b353bf9a 100644 --- a/TShockAPI/FileTools.cs +++ b/TShockAPI/FileTools.cs @@ -1,6 +1,6 @@ /* TShock, a server mod for Terraria -Copyright (C) 2011 The TShock Team +Copyright (C) 2011-2012 The TShock Team This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/TShockAPI/GeoIPCountry.cs b/TShockAPI/GeoIPCountry.cs index 445b348a..c09ccffc 100644 --- a/TShockAPI/GeoIPCountry.cs +++ b/TShockAPI/GeoIPCountry.cs @@ -19,7 +19,7 @@ /* TShock, a server mod for Terraria -Copyright (C) 2011 The TShock Team +Copyright (C) 2011-2012 The TShock Team This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/TShockAPI/GetDataHandlers.cs b/TShockAPI/GetDataHandlers.cs index b9e9e251..32b3c670 100644 --- a/TShockAPI/GetDataHandlers.cs +++ b/TShockAPI/GetDataHandlers.cs @@ -1,6 +1,6 @@ /* TShock, a server mod for Terraria -Copyright (C) 2011 The TShock Team +Copyright (C) 2011-2012 The TShock Team This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/TShockAPI/Group.cs b/TShockAPI/Group.cs index 264570fe..f6d41630 100644 --- a/TShockAPI/Group.cs +++ b/TShockAPI/Group.cs @@ -1,6 +1,6 @@ /* TShock, a server mod for Terraria -Copyright (C) 2011 The TShock Team +Copyright (C) 2011-2012 The TShock Team This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/TShockAPI/HandlerList.cs b/TShockAPI/HandlerList.cs index 32ae94e6..12822962 100644 --- a/TShockAPI/HandlerList.cs +++ b/TShockAPI/HandlerList.cs @@ -1,6 +1,6 @@ /* TShock, a server mod for Terraria -Copyright (C) 2011 The TShock Team +Copyright (C) 2011-2012 The TShock Team This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/TShockAPI/IPackable.cs b/TShockAPI/IPackable.cs index 40480fae..8523aeff 100644 --- a/TShockAPI/IPackable.cs +++ b/TShockAPI/IPackable.cs @@ -1,6 +1,6 @@ /* TShock, a server mod for Terraria -Copyright (C) 2011 The TShock Team +Copyright (C) 2011-2012 The TShock Team This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/TShockAPI/Log.cs b/TShockAPI/Log.cs index 77e8ff86..9e54c53a 100644 --- a/TShockAPI/Log.cs +++ b/TShockAPI/Log.cs @@ -1,6 +1,6 @@ /* TShock, a server mod for Terraria -Copyright (C) 2011 The TShock Team +Copyright (C) 2011-2012 The TShock Team This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/TShockAPI/Net/BaseMsg.cs b/TShockAPI/Net/BaseMsg.cs index 8362f9c5..8e0ce232 100644 --- a/TShockAPI/Net/BaseMsg.cs +++ b/TShockAPI/Net/BaseMsg.cs @@ -1,6 +1,6 @@ /* TShock, a server mod for Terraria -Copyright (C) 2011 The TShock Team +Copyright (C) 2011-2012 The TShock Team This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/TShockAPI/Net/DisconnectMsg.cs b/TShockAPI/Net/DisconnectMsg.cs index ae9b34e6..d62775a4 100644 --- a/TShockAPI/Net/DisconnectMsg.cs +++ b/TShockAPI/Net/DisconnectMsg.cs @@ -1,6 +1,6 @@ /* TShock, a server mod for Terraria -Copyright (C) 2011 The TShock Team +Copyright (C) 2011-2012 The TShock Team This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/TShockAPI/Net/NetTile.cs b/TShockAPI/Net/NetTile.cs index 54a4b6eb..78d53be7 100644 --- a/TShockAPI/Net/NetTile.cs +++ b/TShockAPI/Net/NetTile.cs @@ -1,6 +1,6 @@ /* TShock, a server mod for Terraria -Copyright (C) 2011 The TShock Team +Copyright (C) 2011-2012 The TShock Team This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/TShockAPI/Net/ProjectileRemoveMsg.cs b/TShockAPI/Net/ProjectileRemoveMsg.cs index 66723f93..bc119dcc 100644 --- a/TShockAPI/Net/ProjectileRemoveMsg.cs +++ b/TShockAPI/Net/ProjectileRemoveMsg.cs @@ -1,6 +1,6 @@ /* TShock, a server mod for Terraria -Copyright (C) 2011 The TShock Team +Copyright (C) 2011-2012 The TShock Team This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/TShockAPI/Net/SpawnMsg.cs b/TShockAPI/Net/SpawnMsg.cs index 3a503a5a..36258396 100644 --- a/TShockAPI/Net/SpawnMsg.cs +++ b/TShockAPI/Net/SpawnMsg.cs @@ -1,6 +1,6 @@ /* TShock, a server mod for Terraria -Copyright (C) 2011 The TShock Team +Copyright (C) 2011-2012 The TShock Team This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/TShockAPI/Net/WorldInfoMsg.cs b/TShockAPI/Net/WorldInfoMsg.cs index 211a7ad4..7b64f2a8 100644 --- a/TShockAPI/Net/WorldInfoMsg.cs +++ b/TShockAPI/Net/WorldInfoMsg.cs @@ -1,6 +1,6 @@ /* TShock, a server mod for Terraria -Copyright (C) 2011 The TShock Team +Copyright (C) 2011-2012 The TShock Team This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/TShockAPI/PacketBufferer.cs b/TShockAPI/PacketBufferer.cs index fa057a64..e2ea8e94 100644 --- a/TShockAPI/PacketBufferer.cs +++ b/TShockAPI/PacketBufferer.cs @@ -1,6 +1,6 @@ /* TShock, a server mod for Terraria -Copyright (C) 2011 The TShock Team +Copyright (C) 2011-2012 The TShock Team This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/TShockAPI/Permissions.cs b/TShockAPI/Permissions.cs index 16e3f0a5..70e8867a 100644 --- a/TShockAPI/Permissions.cs +++ b/TShockAPI/Permissions.cs @@ -1,6 +1,6 @@ /* TShock, a server mod for Terraria -Copyright (C) 2011 The TShock Team +Copyright (C) 2011-2012 The TShock Team This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/TShockAPI/Properties/AssemblyInfo.cs b/TShockAPI/Properties/AssemblyInfo.cs index ef64ab0f..650cfa85 100644 --- a/TShockAPI/Properties/AssemblyInfo.cs +++ b/TShockAPI/Properties/AssemblyInfo.cs @@ -1,6 +1,6 @@ /* TShock, a server mod for Terraria -Copyright (C) 2011 The TShock Team +Copyright (C) 2011-2012 The TShock Team This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/TShockAPI/RconHandler.cs b/TShockAPI/RconHandler.cs index 539e87b7..3d314f24 100644 --- a/TShockAPI/RconHandler.cs +++ b/TShockAPI/RconHandler.cs @@ -1,6 +1,6 @@ /* TShock, a server mod for Terraria -Copyright (C) 2011 The TShock Team +Copyright (C) 2011-2012 The TShock Team This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/TShockAPI/Resources.Designer.cs b/TShockAPI/Resources.Designer.cs index 2d3489cd..99b8a890 100644 --- a/TShockAPI/Resources.Designer.cs +++ b/TShockAPI/Resources.Designer.cs @@ -1,6 +1,6 @@ /* TShock, a server mod for Terraria -Copyright (C) 2011 The TShock Team +Copyright (C) 2011-2012 The TShock Team This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/TShockAPI/Rest/Rest.cs b/TShockAPI/Rest/Rest.cs index 0875b3b4..3f2ae2e2 100644 --- a/TShockAPI/Rest/Rest.cs +++ b/TShockAPI/Rest/Rest.cs @@ -1,6 +1,6 @@ /* TShock, a server mod for Terraria -Copyright (C) 2011 The TShock Team +Copyright (C) 2011-2012 The TShock Team This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/TShockAPI/Rest/RestCommand.cs b/TShockAPI/Rest/RestCommand.cs index 3e54a673..334752de 100644 --- a/TShockAPI/Rest/RestCommand.cs +++ b/TShockAPI/Rest/RestCommand.cs @@ -1,6 +1,6 @@ /* TShock, a server mod for Terraria -Copyright (C) 2011 The TShock Team +Copyright (C) 2011-2012 The TShock Team This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/TShockAPI/Rest/RestManager.cs b/TShockAPI/Rest/RestManager.cs index e653bffe..98543d6d 100644 --- a/TShockAPI/Rest/RestManager.cs +++ b/TShockAPI/Rest/RestManager.cs @@ -1,6 +1,6 @@ /* TShock, a server mod for Terraria -Copyright (C) 2011 The TShock Team +Copyright (C) 2011-2012 The TShock Team This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/TShockAPI/Rest/RestObject.cs b/TShockAPI/Rest/RestObject.cs index c2593f44..0133ff6f 100644 --- a/TShockAPI/Rest/RestObject.cs +++ b/TShockAPI/Rest/RestObject.cs @@ -1,6 +1,6 @@ /* TShock, a server mod for Terraria -Copyright (C) 2011 The TShock Team +Copyright (C) 2011-2012 The TShock Team This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/TShockAPI/Rest/RestVerbs.cs b/TShockAPI/Rest/RestVerbs.cs index ddd9a2cd..ea155fcb 100644 --- a/TShockAPI/Rest/RestVerbs.cs +++ b/TShockAPI/Rest/RestVerbs.cs @@ -1,6 +1,6 @@ /* TShock, a server mod for Terraria -Copyright (C) 2011 The TShock Team +Copyright (C) 2011-2012 The TShock Team This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/TShockAPI/Rest/SecureRest.cs b/TShockAPI/Rest/SecureRest.cs index 976d6aae..987cd295 100644 --- a/TShockAPI/Rest/SecureRest.cs +++ b/TShockAPI/Rest/SecureRest.cs @@ -1,6 +1,6 @@ /* TShock, a server mod for Terraria -Copyright (C) 2011 The TShock Team +Copyright (C) 2011-2012 The TShock Team This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/TShockAPI/StatTracker.cs b/TShockAPI/StatTracker.cs index 353c8f19..81df0c50 100644 --- a/TShockAPI/StatTracker.cs +++ b/TShockAPI/StatTracker.cs @@ -1,6 +1,6 @@ /* TShock, a server mod for Terraria -Copyright (C) 2011 The TShock Team +Copyright (C) 2011-2012 The TShock Team This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/TShockAPI/TSPlayer.cs b/TShockAPI/TSPlayer.cs index 3610af2f..e0fbe937 100644 --- a/TShockAPI/TSPlayer.cs +++ b/TShockAPI/TSPlayer.cs @@ -1,6 +1,6 @@ /* TShock, a server mod for Terraria -Copyright (C) 2011 The TShock Team +Copyright (C) 2011-2012 The TShock Team This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/TShockAPI/TShock.cs b/TShockAPI/TShock.cs index 79e1378c..3954616f 100755 --- a/TShockAPI/TShock.cs +++ b/TShockAPI/TShock.cs @@ -1,6 +1,6 @@ /* TShock, a server mod for Terraria -Copyright (C) 2011 The TShock Team +Copyright (C) 2011-2012 The TShock Team This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/TShockAPI/TShockAPI.licenseheader b/TShockAPI/TShockAPI.licenseheader index 32579142..12ed0ea9 100644 --- a/TShockAPI/TShockAPI.licenseheader +++ b/TShockAPI/TShockAPI.licenseheader @@ -1,7 +1,7 @@ extensions: .cs /* TShock, a server mod for Terraria -Copyright (C) 2011 The TShock Team +Copyright (C) 2011-2012 The TShock Team This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/TShockAPI/UpdateManager.cs b/TShockAPI/UpdateManager.cs index cf0b375b..c518aa76 100644 --- a/TShockAPI/UpdateManager.cs +++ b/TShockAPI/UpdateManager.cs @@ -1,6 +1,6 @@ /* TShock, a server mod for Terraria -Copyright (C) 2011 The TShock Team +Copyright (C) 2011-2012 The TShock Team This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/TShockAPI/Utils.cs b/TShockAPI/Utils.cs index 35c51a08..dbe50c9f 100644 --- a/TShockAPI/Utils.cs +++ b/TShockAPI/Utils.cs @@ -1,6 +1,6 @@ /* TShock, a server mod for Terraria -Copyright (C) 2011 The TShock Team +Copyright (C) 2011-2012 The TShock Team This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/UnitTests/BanManagerTest.cs b/UnitTests/BanManagerTest.cs index 2f4daa67..730f11f0 100644 --- a/UnitTests/BanManagerTest.cs +++ b/UnitTests/BanManagerTest.cs @@ -1,6 +1,6 @@ /* TShock, a server mod for Terraria -Copyright (C) 2011 The TShock Team +Copyright (C) 2011-2012 The TShock Team This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/UnitTests/GroupManagerTest.cs b/UnitTests/GroupManagerTest.cs index 7029717d..64d23622 100644 --- a/UnitTests/GroupManagerTest.cs +++ b/UnitTests/GroupManagerTest.cs @@ -1,6 +1,6 @@ /* TShock, a server mod for Terraria -Copyright (C) 2011 The TShock Team +Copyright (C) 2011-2012 The TShock Team This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/UnitTests/ItemManagerTest.cs b/UnitTests/ItemManagerTest.cs index 1fe904f1..febd62ab 100644 --- a/UnitTests/ItemManagerTest.cs +++ b/UnitTests/ItemManagerTest.cs @@ -1,6 +1,6 @@ /* TShock, a server mod for Terraria -Copyright (C) 2011 The TShock Team +Copyright (C) 2011-2012 The TShock Team This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/UnitTests/Properties/AssemblyInfo.cs b/UnitTests/Properties/AssemblyInfo.cs index 42b70b09..9f57e16a 100644 --- a/UnitTests/Properties/AssemblyInfo.cs +++ b/UnitTests/Properties/AssemblyInfo.cs @@ -1,6 +1,6 @@ /* TShock, a server mod for Terraria -Copyright (C) 2011 The TShock Team +Copyright (C) 2011-2012 The TShock Team This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/UnitTests/RegionManagerTest.cs b/UnitTests/RegionManagerTest.cs index aa4419e5..6c4d3ed9 100644 --- a/UnitTests/RegionManagerTest.cs +++ b/UnitTests/RegionManagerTest.cs @@ -1,6 +1,6 @@ /* TShock, a server mod for Terraria -Copyright (C) 2011 The TShock Team +Copyright (C) 2011-2012 The TShock Team This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/UnitTests/UnitTests.licenseheader b/UnitTests/UnitTests.licenseheader index 32579142..12ed0ea9 100644 --- a/UnitTests/UnitTests.licenseheader +++ b/UnitTests/UnitTests.licenseheader @@ -1,7 +1,7 @@ extensions: .cs /* TShock, a server mod for Terraria -Copyright (C) 2011 The TShock Team +Copyright (C) 2011-2012 The TShock Team This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by From d59cda0ce3a2b15348eff2cd0cc1920089709500 Mon Sep 17 00:00:00 2001 From: Lucas Nicodemus Date: Tue, 24 Apr 2012 12:48:32 -0600 Subject: [PATCH 2/3] Refactor Playing method -> ListConnectedPlayers per convention --- TShockAPI/Commands.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/TShockAPI/Commands.cs b/TShockAPI/Commands.cs index f5378e7a..b75deddc 100755 --- a/TShockAPI/Commands.cs +++ b/TShockAPI/Commands.cs @@ -182,7 +182,7 @@ namespace TShockAPI add(Permissions.manageregion, Region, "region"); add(Permissions.manageregion, DebugRegions, "debugreg"); add(null, Help, "help"); - add(null, Playing, "playing", "online", "who", "version"); + add(null, ListConnectedPlayers, "playing", "online", "who", "version"); add(null, AuthToken, "auth"); add(Permissions.cantalkinthird, ThirdPerson, "me"); add(Permissions.canpartychat, PartyChat, "p"); @@ -3023,7 +3023,7 @@ namespace TShockAPI } } - private static void Playing(CommandArgs args) + private static void ListConnectedPlayers(CommandArgs args) { string response = args.Player.Group.HasPermission(Permissions.seeids) ? TShock.Utils.GetPlayersWithIds() From 9e1d707c06e19cc7f1e0511e7e3f9a47ac65654e Mon Sep 17 00:00:00 2001 From: Lucas Nicodemus Date: Tue, 24 Apr 2012 13:35:30 -0600 Subject: [PATCH 3/3] Implemented kicking by player index. /who now displays player index as (IX: ) if you have the correct permission. FindPlayer now finds by ID & name --- TShockAPI/Utils.cs | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/TShockAPI/Utils.cs b/TShockAPI/Utils.cs index dbe50c9f..2a215a3e 100644 --- a/TShockAPI/Utils.cs +++ b/TShockAPI/Utils.cs @@ -86,7 +86,7 @@ namespace TShockAPI sb.Append(", "); } sb.Append(player.Name); - string id = "( " + Convert.ToString(TShock.Users.GetUserID(player.UserAccountName)) + " )"; + string id = "(ID: " + Convert.ToString(TShock.Users.GetUserID(player.UserAccountName)) + ", IX:" + player.Index + ")"; sb.Append(id); } } @@ -187,7 +187,7 @@ namespace TShockAPI } /// - /// Finds a player ID based on name + /// Finds a TSPlayer based on name or id /// /// Player name /// @@ -203,6 +203,18 @@ namespace TShockAPI if (player == null) continue; + try + { + if (Convert.ToInt32(ply) == player.Index && player.Active) + { + return new List { player }; + } + } + catch (Exception e) + { + // Conversion failed + } + string name = player.Name.ToLower(); if (name.Equals(ply)) return new List {player};