Commit graph

3477 commits

Author SHA1 Message Date
Patrikkk
9a49f6ad15
Merge branch 'general-devel' into fishoutnpc-event 2020-05-30 10:53:51 +02:00
Patrikkk
791a6be831
Add additional FoodPlatter event check. Update range check. (#1941)
This is a combination of 3 commits:

* @Olink was right. Adding additional check. Modifying range check.

There are two ways to place food into a plate. One is by having it in hand (mouse) and right clicking, the other is by having the item selected in the... "inventory bar"(?) and right clicking the plate.

Tested range, if player is outside the range, they should not get their item back.

* FoodPlatterHotfix - Update IsInRange range value.

To suggestion of Olink, to consider player lag and increase the range check.

Co-authored-by: Lucas Nicodemus <shank@shanked.me>
2020-05-30 00:39:40 -07:00
Lucas Nicodemus
01e3f9c58d
Merge branch 'general-devel' into general-devel 2020-05-30 00:32:57 -07:00
Lucas Nicodemus
a0726ad8bb
Merge branch 'general-devel' into patch-7 2020-05-30 00:18:44 -07:00
Lucas Nicodemus
efeb8b6167
Merge branch 'general-devel' into patch-6 2020-05-30 00:11:18 -07:00
Lucas Nicodemus
61e7d10941
Merge branch 'general-devel' into patch-5 2020-05-30 00:02:27 -07:00
Lucas Nicodemus
f82ab41a25
Add /sync command to alleviate door related sadness
Run /sync if your doors disappear. This will resync your local client
with the server state. For more information, please see the associated
changelog entry.
2020-05-29 21:04:48 -07:00
Lucas Nicodemus
44ad2d2eff
Remove extra debug info from OnGetData
Per packet debug logs are redundant for people with the packet monitor
plugin. If you need packet monitoring, please install the packet monitor
plugin.
2020-05-29 19:52:03 -07:00
Olink
fd6913f7df Update GetDataHandlers ExtraValue packet handling to match the network protocol.
Update the validation logic to be accurate:
  * use pixels and not tiles
  * allow master mode
  * use npc position and not player position
Cleanup some style inconsistencies in NetHooks_SendData.
2020-05-29 16:44:03 -04:00
Patrikkk
47dd4a4345 FishOutNPC - Simplify bouncer logic. Fix check in event. 2020-05-29 12:00:33 +02: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
695ca52a9a Fix FishOutNPC bouncer debug message. 2020-05-29 03:27:19 +02:00
Patrikkk
9cd4670436 Add FishOutNPC event handler. 2020-05-29 03:25:11 +02:00
Chris
c86a0f2929
Merge branch 'general-devel' into patch-7 2020-05-29 10:02:51 +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
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
moisterrific
51d2d9af69
Fix error in previous change
there's no setdawn, made the mistake of looking at a prev commit instead of the most current version of permissions
2020-05-26 18:51:15 -04:00
moisterrific
2c384aaaeb
Add journey permissions to trustedadmin and owner
hope im doing this right lol
2020-05-26 17:17:01 -04:00
moisterrific
1f045c9a92
Update /spawnboss to include the 2 new bosses
Added Empress of Light and Queen Slime to the list of bosses that can be spawned individually and "all". Also removed the queen case because there are two bosses with queen in their name now.
2020-05-26 15:53:58 -04:00
moisterrific
0d2b591760
Update NPCAddBuff to include Sparkle Slime debuff
It's a new cosmetic debuff added in 1.4, like Wet and Slimed that can be applied to Town NPCs. Wiki: https://terraria.gamepedia.com/Sparkle_Slime_Balloon
2020-05-26 13:45:31 -04: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