Commit graph

836 commits

Author SHA1 Message Date
stacey
067006a092
Add clarity to !HasPermission error messages
And a few other minor formatting/grammar changes.
2020-06-13 13:13:46 -04:00
Patrikkk
bcdd0dc8be GetDataHandler - Add missing PlayerInfo data. 2020-06-05 03:46:04 +02:00
Patrikkk
cffdadbc80 Fix previous conflict resolve merging. 2020-06-02 19:10:34 +02:00
Patrikkk
60840807cf Merge branch 'general-devel' into handlesynctilepicking 2020-06-02 19:08:26 +02:00
Patrikkk
0a1f608a3a Fix conflict resolve merge. Make project buildable.
Had a duplicate HandleSyncRevengeMarker method.
2020-06-02 11:59:24 +02:00
Patrikkk
d919c11add
Merge branch 'general-devel' into handlegolfpacket 2020-06-02 11:52:32 +02:00
Patrikkk
0619092ba5 Fix identing after conflict resolve merge. 2020-06-02 11:41:41 +02:00
Patrikkk
f01274164f
Merge branch 'general-devel' into handlesynccavernmonster 2020-06-02 11:39:11 +02:00
Patrikkk
cd58d79322 Kick player on attempting cavern npc type modification. 2020-06-02 11:34:10 +02:00
Patrikkk
3cc8a75b9b
Merge branch 'general-devel' into emojipacketevent 2020-06-02 11:21:19 +02:00
Patrikkk
f7a8695c8f
Merge branch 'general-devel' into handlegolfpacket 2020-06-02 11:15:17 +02:00
Chris
21b51c577c This one should use 'Read' instead of 'Load' as well 2020-06-02 17:26:32 +09:30
Chris
c7a6d044f4 Minor refactors 2020-06-02 17:19:00 +09:30
Chris
c9b015027d Rename NetModulesTypes to NetModuleType 2020-06-02 14:28:09 +09:30
Chris
48d610d33f Move netmodule handling into handlers namespace
Add handler for teleport pylons, and permission for teleport pylons
2020-06-02 12:59:14 +09:30
Chris
b5c3b430fa Standardize permission rejection message again 2020-06-02 10:20:13 +09:30
Chris
d46f534533 Standardize permission rejection messages 2020-06-02 10:18:40 +09:30
Patrikkk
2177d75066 Add SyncTilePicking event. 2020-06-01 18:31:30 +02:00
Patrikkk
ce5ee0d623 Add HandleSyncCavernMonsterType
This packet is never sent from the client to the server in a normal scenario. Although with modded clients, a packet can be sent to modify the cavernMonsterType of the server world and have the world spawn defined NPC types. Can be used to have the server randomly spawn bosses on players in caverns.
Is it okay to have this simple handling in GetDataHandlers? A seperate class felt like an overkill.

Moved the HandleSyncRevengeMarker packet handler to it's "correct" position, so I won't have merge issues between my last PR. As I've mentioned there, we have the Packets in their numerical order.
2020-06-01 17:02:27 +02:00
Patrikkk
2254df21fd Add Emoji event
This is received from the client when they are trying to display an emoji, this comes in to the server, gets processed, and the server sends back the Emote Bubble packet to the clients.
2020-06-01 14:38:29 +02:00
Patrikkk
26773f61a2 Add LandGolfBallInCup event handler. 2020-06-01 12:07:57 +02:00
Patrikkk
20620f2b47 PacketType handler delegate organization.
We have the elements in GetDataHandlerDelegates dict in order by its packet type.
2020-06-01 11:54:59 +02:00
Chris
badba523e7
Merge branch 'general-devel' into projectilestruct-addition 2020-06-01 19:12:38 +09:30
Chris
a7166536c2
Update projectilestruct to add brief documentation 2020-06-01 19:12:14 +09:30
Chris
26aac0dab9
Merge branch 'general-devel' into fishoutnpc-event 2020-06-01 18:58:06 +09:30
Lucas Nicodemus
dff5f043aa
Merge branch 'general-devel' into fix-bugs 2020-06-01 02:21:21 -07:00
Chris
e658af32ef merge general-devel into fix-sts 2020-06-01 15:21:55 +09:30
Olink
96c7453b33 Merge branch 'general-devel' of github.com:Pryaxis/TShock into fix-bugs 2020-05-30 11:54:09 -04:00
Patrikkk
9934a3935d ProjectileStruct - Adding extra data
Can we store the type of the recent projectile as well? This could be used in my upcoming PR regarding the golf packet where I check for recently created projectiles, and their types. Having only the index is not useful in this scenario, because the projectile can already be killed, so cannot access the Main.projectile array to get the projectile type.

Can this be public instead of internal? Developers could make good use of it, instead of having to implement their own version of RecentProjectiles in their plugins.
2020-05-30 11:22:50 +02:00
Patrikkk
9a49f6ad15
Merge branch 'general-devel' into fishoutnpc-event 2020-05-30 10:53:51 +02:00
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
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
ecb1a8a4e7
Update GetDataHandlers.cs 2020-05-29 17:14:56 +09:30
Chris
45e5773c23 Fix a read bug on NetTiles that causes tiles to have junk data 2020-05-29 17:12:46 +09:30
Patrikkk
9cd4670436 Add FishOutNPC event handler. 2020-05-29 03:25:11 +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
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
7b8bbd1e16
Fix typos in journey permission checks 2020-05-25 00:48:57 -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
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
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