themaster1970sf/TShock
1
0
Fork 0
Code Issues Pull requests Projects Releases 1 Packages Wiki Activity Actions
4630 commits 1 branch 1 tag 88 MiB
Commit graph

3463 commits

Author SHA1 Message Date
Olink
6355f2d9ea Merge branch 'general-devel' of github.com:Pryaxis/TShock into fix-bugs 2020-05-29 17:04:00 -04:00
Olink
50337a1d2f Add support for all rope coil types. 2020-05-29 17:03:48 -04:00
Chris
2e0e5596b0
Fix wall read bug in NetTile 2020-05-29 17:17:24 +09:30
Chris
ecb1a8a4e7
Update GetDataHandlers.cs 2020-05-29 17:14:56 +09:30
Chris
6e4b6e1f5e Fix paint permission check 2020-05-29 13:58:44 +09:30
Patrikkk
a4075fd590 Revert TShockAPI.csproj to original. 2020-05-29 00:10:57 +02:00
Patrikkk
0fa8ae13d7 Implement FoodPlatter placing event. 
This is called when a player is placing a fruit (item) in a plate.
Adding checks to see if they have permission to place or replace a fruit in the item.
Checks if they are within range. And a check to see if they are legitimately placing the item from their hand, and not by sending a raw packet.
 2020-05-28 19:24:28 +02:00
Lucas Nicodemus
814801d894
Experimentally change spawn rules for #1849 
This change applies @AxeelAnder's suggeted patch from #1845 to attempt
to resolve spawn point issues. If you remove your bed spawn point it
should send you back to the map spawn point with this.
 2020-05-27 20:24:43 -07:00
Olink
079541d4c9 Initial working commit. 2020-05-27 23:05:45 -04:00
Lucas Nicodemus
720feed7af
Fix journey mode / kick on death conflict 
This fixes an issue where kick/ban on hardcore/mediumcore death
penalties applied to journey mode characters unintentionally.

Fixes #1901.
 2020-05-26 22:22:41 -07:00
Lucas Nicodemus
3874c04a72
Replace -worldpath with -worldselectpath 
This reverts commit 7ad46abced. This
reintroduces the worldpath argument as per request from #1914, but at a
different name. This is because users have configurations like this,
which no longer work:

-world + -worldpath = crash

If you want to use -worldselectionpath to specify a world, you should be
able to use -worldname, but don't use -world unless you specify an
absolute path to a world.

No matter how we solve this we get a support headache (-worldpath +
-world = crash). This temporary stopgap should work to help address
issue #1914 until we can figure out a final solution. Since users are
impacted by this change, temporarily adding this back is the best move.

To be 100% clear, though:

-world + -worldselectpath without specifying an absolute path will
result in a crash that is unhelpful. Please don't do that.
 2020-05-25 11:57:45 -07:00
Lucas Nicodemus
d1b27d8b7a
Only process journey research updates for SSC mode 
This commit changes the logic for sending and accepting journey research
requests -- only processing those requests in SSC makes sense. This
stops sending extra data to clients that may not know what to do with it
when it's not relevant (not in both SSC and journey mode).

This also stops us from accepting erroneous journey mode NPC spawn rate
update requests when journey mode isn't on but SSC is on due to a weird
client glitch in 1.4.0.4.
 2020-05-25 01:01:47 -07:00
Lucas Nicodemus
1be580d910
Merge branch 'general-devel' of github.com:Pryaxis/TShock into general-devel 2020-05-25 00:49:32 -07:00
Lucas Nicodemus
7b8bbd1e16
Fix typos in journey permission checks 2020-05-25 00:48:57 -07:00
Lucas Nicodemus
0e711da8cc
Merge branch 'general-devel' into region-mysql 2020-05-25 00:40:08 -07:00
Lucas Nicodemus
e9ded60396
Merge branch 'general-devel' into fix-1904 2020-05-25 00:17:35 -07:00
Lucas Nicodemus
9020e2f43f
Merge branch 'general-devel' into fix-1907 2020-05-25 00:16:49 -07:00
Zack
2b4faf4d9b
Update TShockAPI/DB/ResearchDatastore.cs 
@hakusaro raised a solid point in Discord.

Co-authored-by: Lucas Nicodemus <shank@shanked.me>
 2020-05-25 03:11:41 -04:00
Olink
df22a33132 Add some try/catch blocks around the sql commands. 2020-05-25 03:07:54 -04:00
Olink
91998deaf3 Add spawn boss packet handlers for pets. 2020-05-25 03:03:29 -04:00
Olink
56b695b80b Add initial support for Journey mode in SSC. 2020-05-25 02:24:03 -04:00
Lucas Nicodemus
6eb8038991
Refactor grammar of permission error 2020-05-24 22:19:10 -07:00
Lucas Nicodemus
1eeb77d61f
Update codename 2020-05-24 17:32:12 -07:00
Patrikkk
9a8c2fee0d Merge branch 'journeymode_permissions' of https://github.com/Pryaxis/TShock into journeymode_permissions 2020-05-25 02:13:28 +02:00
Patrikkk
a1621329a3 Add enums for magic numbers. 2020-05-25 02:12:59 +02:00
Patrikkk
1f8ae96229
Merge branch 'general-devel' into journeymode_permissions 2020-05-25 01:47:33 +02:00
Patrikkk
6fa288e5db Read PowerModule netmodule data and check for permissions 
Removed leftover from previous commit. Fixed a typeo.
 2020-05-25 01:36:26 +02:00
Patrikkk
d253903de0 Add journey permissions to Permissions.cs 2020-05-25 01:17:11 +02:00
Olink
d04f57d864 Fixes #1867 2020-05-24 17:09:25 -04:00
Lucas Nicodemus
ad82afd800
Merge branch 'general-devel' of github.com:Pryaxis/TShock into general-devel 2020-05-24 14:06:17 -07:00
Lucas Nicodemus
472b81e9f4
Increase default thresholds in config file 
Based on user testing of the new explosives from Olink, these really
need to be higher to support the new lava/wet/dry/honey
bombs/explosives.
 2020-05-24 14:05:54 -07:00
Lucas Nicodemus
35c103e011
Fix bouncer debug message being incorrect 2020-05-24 14:04:11 -07:00
Patrikkk
cb570ec2e0 Wrap permissions in #regions. 2020-05-24 22:59:02 +02:00
Olink
39028484f0 Fixes #1890. Added support for two new invasions. 2020-05-24 16:36:13 -04:00
Lucas Nicodemus
f1b35e47cc
Update config description for bomb range 2020-05-24 13:23:18 -07:00
Olink
16d1cdd360 Track projectile updates being sent by the server, instead of received by the server. 2020-05-24 16:00:20 -04:00
鱼鱼
e39af6f917 fix npc home removal. rename something related. 2020-05-24 16:47:54 +08:00
Olink
3105a977a4 Add fluid rockets. 2020-05-24 04:37:15 -04:00
Olink
8edca72919 Add config option for the bomb radius. 2020-05-24 04:33:03 -04:00
Olink
b73088306d Move the projectile refresh to Bouncer. 
Bouncer now has an OnSecondUpdate().
Move projectile created tracking to GetDataHandler from Bouncer.
 2020-05-24 04:27:12 -04:00
Zack
9209ac0b73
Apply suggestions from code review 
Co-authored-by: Lucas Nicodemus <shank@shanked.me>
 2020-05-24 04:19:00 -04:00
Olink
3b0c5f7775 Make bouncer compile. Reduce range checks. 2020-05-24 03:54:27 -04:00
Olink
965361c406 Add a projectile tracker, so that we can allow fluid bombs. 2020-05-24 03:48:08 -04:00
Lucas Nicodemus
ae87f242d7
Clarify log debug from SendTileSquare 2020-05-23 23:56:49 -07:00
Lucas Nicodemus
37e65b64dc
Add note about what Tombstones do and don't do 2020-05-23 23:47:50 -07:00
Lucas Nicodemus
38fb33feb8
Merge branch 'general-devel' of github.com:Pryaxis/TShock into general-devel 2020-05-23 23:34:57 -07:00
Lucas Nicodemus
cdb1953f36
Clean up world save to be less alarmist 2020-05-23 23:33:16 -07:00
Axeel
535c9a2a7e
Fix wind command (#1879) 
* Fix wind command
 2020-05-24 13:39:50 +08:00
Axeel
8d277edf04
Fix npcbuff bouncer (#1881) 
* Fix npcbuff bouncer

* Update CHANGELOG.md

Co-authored-by: Lucas Nicodemus <shank@shanked.me>
 2020-05-24 13:31:21 +08:00
Patrikkk
a7e91b9688
Merge branch 'general-devel' into region-mysql 2020-05-24 02:41:54 +02:00