Commit graph

4788 commits

Author SHA1 Message Date
Patrikkk
4f66e660d4 Bouncer OnTileEdit - Add tile replace action to tileban check.
Tiny change, but a pressing matter. My smallest PR ever? hahah.
2020-06-09 00:01:57 +02:00
Lucas Nicodemus
ab1e63beee
Add changelog warning to maka comment 2020-06-06 20:37:01 -07:00
Chris
90146dfa03
Merge pull request #1997 from moisterrific/patch-15
Add additional onXthresholdBroken to changelog
2020-06-07 12:51:12 +09:30
Chris
9b9ccfd6f1
Merge branch 'general-devel' into patch-15 2020-06-07 12:48:41 +09:30
Chris
5f03f68a6f
Merge pull request #1996 from moisterrific/patch-14
Add config defined threshold kicks to Bouncer
2020-06-07 12:47:13 +09:30
Chris
ff38075426
Merge branch 'general-devel' into patch-14 2020-06-07 12:41:49 +09:30
Chris
8bd6d72cf7
Merge pull request #2015 from moisterrific/patch-17
Add martians to validEvents response message
2020-06-07 12:41:36 +09:30
Chris
ce21d56b86
Merge branch 'general-devel' into patch-17 2020-06-07 12:36:42 +09:30
Chris
3ffccf9799
Merge pull request #2010 from Pryaxis/fixfishoutnpc2
FishOutNPC - Fix some rods not fishing out NPCs.
2020-06-07 12:36:33 +09:30
Chris
325813a57b
Merge branch 'general-devel' into fixfishoutnpc2 2020-06-07 12:32:45 +09:30
Chris
313213a068
Merge pull request #2001 from moisterrific/patch-16
Add new perms and move more perms to trustedadmin
2020-06-07 12:32:12 +09:30
moisterrific
2c1833342e
Add martians to validEvents response message 2020-06-06 22:54:14 -04:00
Patrikkk
156cf4930b FishOutNPC - Fix some rods not fishing out NPCs.
I was wrong, not all bobbers are named "Bobber".
Just found that Projectile now has an extra field which determines if the given type is a bobber. This field is set in Projectile.SetDefaults method in the following logic
`((type >= 360 && type <= 366) || type == 381 || type == 382 || type == 760 || type == 775)`
I think it is reasonable to use the bobber field, as it would be updateproof too.
Tested and working. Fixes #1985
2020-06-06 22:28:37 +02:00
moisterrific
7d4ce5af69
Add latest commits regarding new permissions 2020-06-06 00:36:29 -04:00
moisterrific
470da46511
Add new perms and move more perms to trustedadmin
Add new journey mode research perm and move all existing journey perms from owner to trustedadmin. Also added pylon tp to default and added /spawn perm to admin.
2020-06-06 00:28:21 -04:00
moisterrific
e90d84be02
Condense if/else statements
And clean up OnNPCStrike while I'm at it
2020-06-05 11:53:21 -04:00
Lucas Nicodemus
31e79a3918
Update changelog for 4.4.0 pr11 2020-06-04 21:29:50 -07:00
Chris
014ea733c7
Merge pull request #1998 from Pryaxis/sts-patch-1
Add some sanity checking around tile object sizes
2020-06-05 13:15:33 +09:30
Chris
67859f5dca
Merge branch 'general-devel' into sts-patch-1 2020-06-05 13:12:22 +09:30
Chris
3d018a27af
Merge branch 'general-devel' into patch-14 2020-06-05 12:17:42 +09:30
Chris
07f0dc1540
Merge pull request #1995 from moisterrific/patch-13
Add KickOnThresholdBroken for more thresholds
2020-06-05 12:16:34 +09:30
Chris
c99deae9cc Add some sanity checking around tile object sizes 2020-06-05 12:16:24 +09:30
moisterrific
911f0d9320
Add additional onXthresholdBroken to changelog
sorry I couldn't figure out how to put everything in one pr
2020-06-04 22:39:52 -04:00
Chris
5e3f70382d
Merge branch 'general-devel' into patch-13 2020-06-05 12:09:14 +09:30
Chris
6f65107b1a
Merge pull request #1994 from Pryaxis/playerinfodata
GetDataHandler - Add missing PlayerInfo data.
2020-06-05 12:08:14 +09:30
moisterrific
e009febdca
Add config defined threshold kicks to Bouncer
along with various other minor refinements
2020-06-04 22:25:34 -04:00
Patrikkk
b0c512a127 Update CHANGELOG.md 2020-06-05 03:47:02 +02:00
Patrikkk
bcdd0dc8be GetDataHandler - Add missing PlayerInfo data. 2020-06-05 03:46:04 +02:00
moisterrific
fa6a39aafe
Add KickOnThresholdBroken for more thresholds
There's KickOnDamageThresholdBroken but no option for kick for other thresholds, thought I should add it.
2020-06-04 20:51:00 -04:00
Lucas Nicodemus
056f5b1c6a
Merge pull request #1986 from moisterrific/patch-12
Change DebugLogs to true by default
2020-06-04 17:30:49 -07:00
Lucas Nicodemus
c8aa67ec4d
Merge branch 'general-devel' into patch-12 2020-06-04 17:26:58 -07:00
Lucas Nicodemus
dbaa739066
Merge pull request #1990 from Pryaxis/Update-submodule.-1.4.0.5
Update submodule. 1.4.0.5
2020-06-04 17:22:20 -07:00
Patrikkk
65b0eb9ccf Update CHANGELOG.md 2020-06-05 00:26:32 +02:00
Patrikkk
268c772eea Update submodule. 1.4.0.5 2020-06-05 00:25:01 +02:00
Chris
a972c348a6
Merge pull request #1987 from Pryaxis/fixfishoutnpc
OnFishout - Fixing #1985 - Making debug messages clearer. Modifying r…
2020-06-04 20:07:22 +09:30
Patrikkk
739fa69571
Merge branch 'general-devel' into fixfishoutnpc 2020-06-04 12:28:12 +02:00
Patrikkk
00161088e7 OnFishoutNPC - Use ConsoleDebug for message. 2020-06-04 12:25:55 +02:00
Patrikkk
2fd5941821 OnFishout - Fixing #1985 - Making debug messages clearer. Modifying redundant check.
The actual issue was a missing `!` beind IsInRange. If player was doing a valid fishing event, it handled the NPC spawning.
I've split up the checks to make clearer debug messages.
Main.projectile objects are never null. Bobber projectile is never killed when the FishOutNPC event occurs. The projectile type in the check can only be 0 if no recent projectile found that has the name Bobber.
2020-06-04 12:23:48 +02:00
Chris
fe4679ba95 Remove invalid dictionary entries in CreativePowerHandler 2020-06-04 19:40:41 +09:30
moisterrific
91c3557610
Change DebugLogs to true by default
Given that this is a pre-release and it no longer makes the CLI unreadable I think it should be on by default to make troubleshooting easier.
2020-06-03 22:54:51 -04:00
Chris
5c0efce3b2
Merge pull request #1978 from Pryaxis/handlesynctilepicking
Handlesynctilepicking
2020-06-03 11:59:36 +09:30
Patrikkk
4587ac4d5c Update CHANGELOG.md 2020-06-02 19:27:42 +02:00
Patrikkk
7487afafb6 SyncTilePickingHandler - Remove redundant check. Properly document method. 2020-06-02 19:26:25 +02:00
Patrikkk
e738d8e794 Implementing SyncTilePickingHandler. Patching tile damage related exploits.
With this packet, players could kick all players by sending invalid world position data.
2020-06-02 19:20:27 +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
Chris
a661841448 Hello sir you dropped your ident 2020-06-02 19:37:03 +09:30
Chris
7b316f3cd5 Refactor LandGolfBallInCupHandler to use IPacketHandler<TArgs> 2020-06-02 19:35:53 +09:30
Chris
f1e8fbd8ee
Merge pull request #1968 from Pryaxis/handlegolfpacket
Handlegolfpacket
2020-06-02 19:34:48 +09:30
Patrikkk
0a1f608a3a Fix conflict resolve merge. Make project buildable.
Had a duplicate HandleSyncRevengeMarker method.
2020-06-02 11:59:24 +02:00