Commit graph

2300 commits

Author SHA1 Message Date
Zack Piispanen
fddaf657a5 Teleport code has been cleaned up.
Added tp prevention based on permission tp.  Updated to latest server exe.
2013-09-30 16:23:11 -04:00
k0rd
584950bc6f Added a check to see if player has recently lit a fuse
This will prevent cheat detection from wrongly triggering if the player uses a fused explosive and quickly switches to another weapon before the explosive detonates.

I also commented out a block where we force explosives server-side, this would usually cause dynamite to explode in the wrong position when it bounced around too much.
2013-09-30 06:45:33 -04:00
k0rd
6e29a3b0ca needed for new explosive property 2013-09-30 04:47:31 -04:00
k0rd
2185b18705 allow explosives to break tiles 2013-09-30 04:46:32 -04:00
Zack Piispanen
6185559c6a More whoops moments k0rd didnt find for me.
Updated the Server bin.
2013-09-30 01:33:07 -04:00
Zack Piispanen
7ea9be6e75 Changed how EditTile was handled so that we have enums and pass those instead of confusing bytes.
Comments should be updated to reflect new stuff.
2013-09-29 18:11:08 -04:00
Zack Piispanen
203611706e Fixed long if statement 2013-09-29 08:53:47 -04:00
Zack Piispanen
1bade821da Nothing to see here... 2013-09-29 08:26:05 -04:00
Steven French
155ed75c99 uncomment StrikeNPC and SetTime packets 2013-09-29 23:21:44 +13:00
Zack Piispanen
40ba6c56d3 Update packet logic up to 17 (not including 17 ->tile edit...something needs to be done with the last two bytes) 2013-09-29 05:29:18 -04:00
k0rd
c80ebbc116 Changed collision detection margins; added slush to it too. 2013-09-29 04:59:56 -04:00
k0rd
954b5f8b4c Merge remote branch 'origin' into 1.2_terraria 2013-09-29 03:57:52 -04:00
k0rd
ef2af933c4 beginning tile types in NetTile.cs
fix typo in GetDataHandlers.cs
2013-09-29 03:57:04 -04:00
Zack Piispanen
6d01f604a7 Merge branch '1.2_terraria' of github.com:Olink/TShock_1.2 into 1.2_terraria 2013-09-29 03:41:38 -04:00
Zack Piispanen
1a2f874285 Implemented Packet Teleport mechanism. 2013-09-29 03:37:20 -04:00
k0rd
a2fc066965 Added better noclip detection, including support for half and slanted blocks, and an ignore for honey. 2013-09-29 02:29:59 -04:00
Zack Piispanen
e148d29c66 Added packet changes for 1.2 protocol up to 7(world info) 2013-09-29 01:02:07 -04:00
Zack Piispanen
7731bc46f1 More minor fixes 2013-09-28 23:52:51 -04:00
Zack Piispanen
c17b661166 Stripped out stupid shit
Commented packets we dont know about yet.
2013-09-28 17:32:03 -04:00
Zack Piispanen
dea360869b Refactored the many matches found redundancy by adding a utils method. Changed the csproj to build x86 instead of anycpu which was causing issues for release. 2013-09-27 01:42:13 -04:00
Lucas Nicodemus
1a1d980186 VERSION TICK: 4.1.0.926 & Terraria 1.2 Code Freeze 2013-09-26 02:11:05 -06:00
Lucas Nicodemus
f7176f5119 Merge pull request #536 from MarioE/general-devel
Overhauled permissions.
2013-09-26 00:52:32 -07:00
MarioE
0dfe99ca68 Split superadmin permission. 2013-09-25 20:52:03 -04:00
MarioE
9c33980161 Change tp and rootonly. 2013-09-24 20:03:56 -04:00
MarioE
e1531ab675 Overhauled permissions.
Overhauled permissions to use permission nodes, and separated some
permissions into smaller ones (such as cfg into tshock.cfg.maxspawns,
tshock.cfg.spawnrate, etc),
2013-09-23 18:53:36 -04:00
Lucas Nicodemus
e0809427e0 Merge pull request #535 from Olink/permissions_change
Fixed ancient permissions defaults that sucked.
2013-09-22 20:52:19 -07:00
Zack Piispanen
cc70a37af0 spaces: 0 tabs: 1 2013-09-22 23:33:36 -04:00
Lucas Nicodemus
cc3d2e647e Merge pull request #532 from Olink/general-devel
Ban system is more robust; supports expirations
2013-09-22 20:16:32 -07:00
Zack Piispanen
b7019d8267 change permissions to tshock.xxx and fix default group creating to reference permissions that exist, and not hardcoded strings. 2013-09-22 23:14:14 -04:00
Zack Piispanen
8980a2155a Removed redundant code. 2013-09-22 22:56:52 -04:00
Zack Piispanen
a3c1b8cc49 Apparently this file didnt want to be commited last time. 2013-09-22 16:27:23 -04:00
Zack Piispanen
77a2d66b8e Merge branch 'general-devel' of github.com:TShock/TShock into general-devel 2013-09-22 16:04:32 -04:00
Zack Piispanen
856def83b3 Added basic framework for allowing for ban durations and banning admin.
Added BanningUser, Date(of ban), and Expiration to the db
On join, Expiration is checked, if ban is expired we remove it and the user is allowed on.
When running the ban command, your UAN is used as the banning user, and the date is that moment, with no expiration.
#531
2013-09-22 16:04:12 -04:00
Lucas Nicodemus
e86826124a Removed direct AWS link from README 2013-09-21 19:25:24 -06:00
Lucas Nicodemus
222042cc4d Merge pull request #530 from Olink/general-devel
Added LastAccessed time field and KnownIPs field to the user database. Note: extent of testing was starting TShock again, so may have broken something important (e.g. stat tracking)
2013-09-21 18:04:39 -07:00
Zack Piispanen
7c0bcceb9f Added LastAccessed time field and KnownIPs field to the user database. This resulted in some changes everywhere, such as new logic with default groups. Apparently, somehow, the ip based stuff worked even though no ips were set to properly grab the user group. The wrong group was being assigned to new users resulting in a player with 0 permissions. This is now fixed. 2013-09-21 20:57:14 -04:00
Lucas Nicodemus
d4e193b44d Merge pull request #529 from k0rd/general-devel
Remove WorldID from the WHERE clause in UPDATE SQL for RememberedPosManager
2013-09-21 14:36:08 -07:00
Lucas Nicodemus
95969b203d Merge pull request #528 from Olink/general-devel
Removed ip address from users, as well as changed /user add syntax to be...
2013-09-21 14:34:39 -07:00
Zack Piispanen
ba42fb08df Removed ip address from users, as well as changed /user add syntax to be '/user add username password group' instead of colon bullshit. 2013-09-21 17:11:22 -04:00
k0rd
88e8e65dcb Remove WorldID from the WHERE clause in UPDATE SQL for RememberedPosManager, changed logic to also update the WorldID 2013-09-21 16:41:45 -04:00
k0rd
d36a549e1e Merge remote branch 'upstream/general-devel' into general-devel 2013-09-21 16:41:25 -04:00
Zack Piispanen
d7da68a262 Merge branch 'general-devel' of github.com:TShock/TShock into general-devel 2013-09-21 16:06:10 -04:00
Zack Piispanen
4fed645fde Added config override for stat hacks. This makes updating for 1.12 easy as well since these will change then, small part of #525 2013-09-21 16:06:01 -04:00
Lucas Nicodemus
07c639d569 Merge pull request #524 from Olink/general-devel
Add in error ignore for the socket exception in the packet bufferer.
2013-09-21 11:19:22 -07:00
Zack Piispanen
b23cdb41c3 Whelps, the info in the issue was not accurate. We are looking for the exception that writes a warning to the log file, not the console, not an error. This should be the right fix 2013-09-21 12:52:46 -04:00
Zack Piispanen
d0ba424cd1 Add in error ignore for the socket exception in the packet bufferer. 2013-09-21 12:22:22 -04:00
Zack Piispanen
77e845d340 Merge branch 'general-devel' of github.com:TShock/TShock into general-devel 2013-09-17 18:45:17 -04:00
Zack Piispanen
ef584c62d7 Added Application tokens that can never be deleted, and are loaded either by the command line arg, or the list in the config file. Other plugins can easily add their own tokens into the dictionary as well, however, I believe the config file approach works best for transparency to the user.
Currently, this is an extremely complex looking field in the config file now.  I don't think we should add a placeholder tho as servers wouldn't realize they had a rest token there.  Perhaps when we do a dump of the config file, someone can add the format for this field.

Closes #520
2013-09-17 18:44:58 -04:00
Lucas Nicodemus
fc38e90369 Properly added hipchat notifications this time 2013-09-17 01:09:44 -06:00
Lucas Nicodemus
7e5fd428fd Add hipchat notifications 2013-09-17 01:07:27 -06:00