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

4621 commits

This branch
This branch
All branches
Author SHA1 Message Date
Chris
6e4b6e1f5e Fix paint permission check 2020-05-29 13:58:44 +09:30
Patrikkk
4290d0af1a
Merge pull request #1940 from Pryaxis/foodplatter-event 
Implement FoodPlatter placing event.
 2020-05-29 00:22:24 +02:00
Patrikkk
a4075fd590 Revert TShockAPI.csproj to original. 2020-05-29 00:10:57 +02:00
Patrikkk
3c0a990de6 Update CHANGELOG.md 2020-05-28 20:47:21 +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
Lucas Nicodemus
073088156c
Undo the last change related to funding file 
:S
 2020-05-27 01:51:12 -07:00
Lucas Nicodemus
7ee9541ea1
Add devs who've enabled github sponsors to funding 2020-05-27 01:41:52 -07: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
5a4526b10a
Update changelog with worldpath changes 2020-05-25 12:22:58 -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
fb418095fe
Fix changelog 2020-05-25 00:49:57 -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
ddb77adb79
Merge pull request #1816 from Pryaxis/region-mysql 
Missing backtick from RegionManager Group table.
 2020-05-25 00:47:01 -07:00
Lucas Nicodemus
0e711da8cc
Merge branch 'general-devel' into region-mysql 2020-05-25 00:40:08 -07:00
Lucas Nicodemus
b1f703e05d
Merge pull request #1910 from Olink/fix-1904 
Add spawn boss packet handlers for pets.
 2020-05-25 00:17:48 -07:00
Lucas Nicodemus
e9ded60396
Merge branch 'general-devel' into fix-1904 2020-05-25 00:17:35 -07:00
Lucas Nicodemus
5d35c4f2c5
Merge pull request #1909 from Olink/fix-1907 
Add initial support for Journey mode in SSC.
 2020-05-25 00:16:57 -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
96ad7a5dd8 Update CHANGELOG.md 2020-05-25 02:26:58 -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
cb31997acc
One more changelog change 2020-05-24 20:59:25 -07:00
Lucas Nicodemus
2cd4e2f858
Update changelog again for vtick 2020-05-24 20:56:23 -07:00
Lucas Nicodemus
a2cbd65f59
Add more info about journey perms to changelog 2020-05-24 20:54:54 -07:00
Lucas Nicodemus
a3e507c8f1
Update defect report template 2020-05-24 20:46:54 -07:00
Lucas Nicodemus
1eeb77d61f
Update codename 2020-05-24 17:32:12 -07:00
Lucas Nicodemus
2c230dd6c5
Merge pull request #1902 from Pryaxis/journeymode_permissions 
Journeymode permissions
 2020-05-24 17:31:25 -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
63f63347a4 Update CHANGELOG.md 2020-05-25 01:38:13 +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
Lucas Nicodemus
e189ee4461
Merge pull request #1897 from Olink/fix-1867 
Fixes #1867
 2020-05-24 14:31:23 -07: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
Lucas Nicodemus
2368a55834
Merge pull request #1895 from Olink/fix-1890 
Fixes #1890.  Added support for two new invasions.
 2020-05-24 13:45:32 -07:00
Olink
39028484f0 Fixes #1890. Added support for two new invasions. 2020-05-24 16:36:13 -04:00
Lucas Nicodemus
b634499ab4
Merge pull request #1883 from Olink/fixes-1872 
Fixes 1872
 2020-05-24 13:28:34 -07:00
Lucas Nicodemus
f1b35e47cc
Update config description for bomb range 2020-05-24 13:23:18 -07:00
Olink
fffb1b1083 Update changelog. 2020-05-24 16:08:03 -04:00