Lucas Nicodemus
12701e54ba
Update submodule again?
2017-12-11 15:53:34 -07:00
Lucas Nicodemus
b923f74782
Merge remote-tracking branch 'origin/general-devel' into fragments
2017-12-11 15:52:26 -07:00
Chris
361a10e884
Merge pull request #1553 from Ryozuki/update-company
...
Update Assembly company to Pryaxis
2017-12-12 09:11:38 +10:30
Lucas Nicodemus
7ef0b581eb
Merge branch 'general-devel' into update-company
2017-12-11 15:33:51 -07:00
Ryozuki
b392890551
update copyright notice
2017-12-11 23:09:07 +01:00
Chris
fac846ce02
Merge pull request #1552 from bartico6/general-devel
...
Update submodule TerrariaAPI-Server
2017-12-12 08:33:48 +10:30
Lucas Nicodemus
903b5b124e
Remove more randomly commented out code with no apparent reason
2017-12-11 10:04:21 -07:00
Ryozuki
bbabec6003
update changelog
2017-12-11 16:29:37 +01:00
Ryozuki
c1c5716006
update assembly company to Pryaxis
2017-12-11 16:26:19 +01:00
Lucas Nicodemus
5c9d2ed870
Simpler check (thanks @bartico6) on OPK's nullcheck.
2017-12-11 08:23:36 -07:00
Lucas Nicodemus
e19fd22fe0
Change Utils.SearchProjectile to return -1 in error
...
Thanks for checking this out, @bartico6. Fixes #1549 .
Note: this method only returns 1 because the game won't allocate
more identity/index combo. Apparently, according to RL.
2017-12-11 08:18:23 -07:00
quake1337
1e233d15e7
Update submodule
2017-12-11 15:33:53 +01:00
Lucas Nicodemus
6ed110f862
Change a bounds check to handle a packet instead of letting it go.
...
This change reverts mod to line 1525 of GetDataHandlers.cs in
672d360e9d
2017-12-11 00:28:08 -07:00
Lucas Nicodemus
4b08d61673
Change null check to return true in HandlePlayerUpdate
...
After confirming with @QuiCM on this, we couldn't figure out why
this was set to false in the first place. As a result, we changed
it to true to conform with usual logic (bad stuff? reject it.).
2017-12-11 00:17:58 -07:00
Lucas Nicodemus
9b8aaceb12
Merge remote-tracking branch 'origin/general-devel' into fragments
2017-12-10 23:45:03 -07:00
Lucas Nicodemus
ba851d3570
Remove TShock.CheckProjectilePermission
...
Add TSPlayer.HasProjectilePermission() and its inverse:
TSPlayer.LacksProjectilePermission()
2017-12-10 23:38:03 -07:00
Lucas Nicodemus
c5f9a51802
Move most of HandleProjectileKill to Bouncer
...
Added GetDataHandlers.ProjectileKill hook and related arguments.
Fired when a projectile kill packet is accepted by the server.
2017-12-10 23:07:17 -07:00
Chris
7349d0e877
Merge pull request #1547 from bartico6/general-devel
...
Make TShock pull OTAPI from the correct folder on build
2017-12-11 10:57:16 +10:30
quake1337
a5e196178e
Add credit
2017-12-11 01:16:10 +01:00
quake1337
1f79e14bd7
Make TShock pull OTAPI from the correct folder on build
2017-12-11 01:12:27 +01:00
Lucas Nicodemus
135826f15d
Merge pull request #1544 from Patrikkk/general-devel
...
Add missing "if handled - return" code to OnNameCollision.
2017-12-10 12:41:52 -07:00
Lucas Nicodemus
abaeef5f7e
Merge branch 'general-devel' into general-devel
2017-12-10 12:41:44 -07:00
Patrikk
6f044b2123
Adding missing Changelog.
2017-12-10 20:37:59 +01:00
Lucas Nicodemus
7181757dd3
Changelog bot message is more prodding
...
If people keep ignoring the bot, I'm going to make it block merging too.
2017-12-10 12:26:54 -07:00
Patrikk
740ad4d6c3
Add missing "if handled - return" code.
2017-12-10 20:14:54 +01:00
Lucas Nicodemus
2cfa633df4
Remove commented out code from HandleProjectileKill
2017-12-10 11:26:01 -07:00
Lucas Nicodemus
d3c566db83
Move a large majority of OnPlayerUpdate to Bouncer
...
I really really don't understand why we're doing Terraria's data
sync for them (see HandlePlayerUpdate). Someone know why?
2017-12-10 10:04:27 -07:00
Lucas Nicodemus
949d0e0ffa
More remove notes
2017-12-10 08:56:17 -07:00
Lucas Nicodemus
79802cd9e0
Comment more things in Bouncer
2017-12-10 08:54:32 -07:00
Lucas Nicodemus
3e5c1bf0c5
Merge remote-tracking branch 'origin/general-devel' into fragments
2017-12-09 21:06:47 -07:00
Chris
edc16f8816
Merge pull request #1537 from Pryaxis/fix-permdump
...
Fix permission dumping
2017-12-10 14:28:53 +10:30
Chris
ba31d1faab
Merge branch 'general-devel' into fix-permdump
2017-12-10 14:24:27 +10:30
Chris
f689d77a5b
Merge pull request #1532 from Pryaxis/cmdline-fix
...
Updates the commandline parser to not be broken.
2017-12-10 14:23:33 +10:30
Lucas Nicodemus
c7a04c8e1b
Merge branch 'fix-permdump' of github.com:Pryaxis/TShock into fix-permdump
2017-12-09 20:43:09 -07:00
Chris
078bd15300
Merge branch 'general-devel' into cmdline-fix
2017-12-10 14:12:58 +10:30
Lucas Nicodemus
691a368425
Change permission node to tshock.cfg.createdumps
2017-12-09 20:42:47 -07:00
Lucas Nicodemus
434e817b68
Merge branch 'general-devel' into fix-permdump
2017-12-09 19:29:34 -07:00
Lucas Nicodemus
677d15efbb
Merge pull request #1539 from Zaicon/fix-itemdump
...
Fixed IndexOutOfRange exception
2017-12-09 19:28:38 -07:00
Zaicon
82f53addd7
Update CHANGELOG.md
2017-12-09 20:12:12 -06:00
Zaicon Kiroshu
4638b85adc
Fixed IndexOutOfRange exception
2017-12-09 18:48:40 -06:00
Lucas Nicodemus
14c071350c
Mark Utils.DumpPemrissionMatrix as internal
2017-12-09 17:15:21 -07:00
Lucas Nicodemus
985dcebda9
Comment what DumpPermissionMatrix does
2017-12-09 17:14:59 -07:00
Lucas Nicodemus
2e64d65910
Modify call to Utils.Dump() from the server context to not stop
2017-12-09 16:09:53 -07:00
Lucas Nicodemus
aa2f040787
Change command /datadump to /dump-reference-data
2017-12-09 16:03:12 -07:00
Lucas Nicodemus
bdabf020d2
tshock.admin.createdumps is now a default owner level permission
2017-12-09 15:58:42 -07:00
Lucas Nicodemus
419b5415da
Updated the changelog
2017-12-09 15:57:57 -07:00
Lucas Nicodemus
63179deaa5
Adds /dumpdata which dumps the permission table & ref data.
2017-12-09 15:54:51 -07:00
Lucas Nicodemus
dd7ffe2d3a
Move PlayerKillMeV2 anti-crash to Bouncer
...
Removed PacketTypes.PlayerKillMe since it's out of the protocol.
Removed handler method for PlayerKillMe since it's out of the
protocol.
Updated changelog to reflect new hook changes.
2017-12-09 13:50:18 -07:00
Lucas Nicodemus
54c33a5a09
Merge remote-tracking branch 'origin/general-devel' into fragments
2017-12-09 10:33:55 -07:00
Lucas Nicodemus
d937789c15
Merge pull request #1536 from Ryozuki/pr-update-otapi
...
Update Newtonsoft.Json Fixes #1526
2017-12-09 10:31:42 -07:00
