Commit graph

3159 commits

Author SHA1 Message Date
Lucas Nicodemus
bfbe58e9ed Implement cooldown warnings on build permissions 2017-12-22 10:03:59 -07:00
Lucas Nicodemus
8a88fd1642 Merge branch 'general-devel' into crp 2017-12-22 09:42:25 -07:00
Lucas Nicodemus
91b0ed71a5 Remove connections per IP code. Closes #1577 2017-12-22 09:40:25 -07:00
Lucas Nicodemus
e370873fff Warn players if they can't modify the world
This reimplements warnings that CheckTilePermissions previously had. It
defaults to on because every single call currently in TShock expects it
to be on.
2017-12-22 01:30:29 -07:00
Lucas Nicodemus
7b2a4494b5 Move ice tile processing to TSPlayer.
This moves ice tile placement and processing from
TShock.CheckTilePermissions to TSPlayer in the form of the new boolean
'HasModifiedIceSuccessfully.' This is such a stupid thing we have to
track, but we have to track it.

Previously, we duplicated all of the check permission code and inserted
special ice code paths. This duplicated a ton of code for little gain.
The result of moving everything is that the control flow is easier to
follow.

In Terraria ice tiles are placed and melt on a timer so it's necessary
to track them being placed and removed to permit tile events that would
otherwise be blocked due to region checks and stuff. They're usually
fairly harmless blocks, and without this code, ice wouldn't work
properly. It's not ideal for this to be in TShock at all.
2017-12-22 01:16:18 -07:00
Lucas Nicodemus
195a23a7e5 Migrate most of CheckTilePermission to TSPlayer
TShock.CheckTilePermission(ply, x, y, paint) has been replaced with
TSPlayer.HasPaintPermission and TSPlayer.HasBuildPermission
respectively. These two methods dramatically simplify the logic required
to process build permissions.

Still todo after this commit:

1. Implement warnings for when a player fails a permission check on
build. This is probably going to be accomplished by a default argument
to the HasBuildPermission signature.

2. Create a variant that checks for ice tile permission and use like
HasPaintPermission() so as to remove the other
TShock.CheckTilePermission method.

Annoyingly, all of the existing methods that start with Check seem to
"check" if they player _doesn't_ have permission (true = no permission),
which makes nearly every call negative.
2017-12-22 00:31:02 -07:00
Lucas Nicodemus
fbfb509cc9 Merge branch 'checkspawn' into crp 2017-12-22 00:29:39 -07:00
Lucas Nicodemus
09121368e4 Move TShock.CheckRangePermission to TSPlayer
TShock.CheckRangePermission is now TSPlayer.IsInRange, but the most
important thing is that this method returns the opposite of what the
original did, so all of the calls that would go to it are now inverted.
2017-12-21 20:32:07 -07:00
Lucas Nicodemus
64241a44c7 Move TShock.CheckSpawn to Utils.IsInSpawn
Continuing in the quest to clean things out of the TShock main class,
this moves CheckSpawn out and renames it for clarity.
2017-12-21 19:54:14 -07:00
Lucas Nicodemus
7730faf94f Change diction to refer to "saved data" on Disable 2017-12-21 08:22:51 -07:00
Lucas Nicodemus
ea630e5aa2 Rephrase SSC login message to avoid grammar choice 2017-12-20 21:32:56 -07:00
Chris
215970bab2
Merge branch 'general-devel' into checkignores 2017-12-21 13:28:06 +10:30
Chris
97f9de2e4e
Merge branch 'general-devel' into hook-init 2017-12-21 13:18:18 +10:30
Lucas Nicodemus
e1e4f41118 Made disable message for login use specifier 2017-12-20 19:00:16 -07:00
Lucas Nicodemus
97f48d6d41 Renamed TSPlayer.CheckIgnores() -> TSPlayer.IsBeingDisabled()
Since all of the flags it was checking have been demystified, this
is pretty self explanatory now.
2017-12-20 17:42:59 -07:00
Lucas Nicodemus
8e5ee7d286 Renamed IgnoreActionsForClearingTrashCan to conform w/ changes
This just changes IgnoreActionsForClearingTrashCan to meet the
same naming scheme for the rest of the old ignore checks. For
consistency. Consistency is nice.
2017-12-20 17:33:18 -07:00
Lucas Nicodemus
4e186e7375 Replace TSPlayer.IgnoreActionsForDisabledArmor -> boolean
TSPlayer.IgnoreActionsForBannedArmor was useless because it only
stored the last armor/dye a player had. Replaced with a boolean.
2017-12-20 17:29:10 -07:00
Lucas Nicodemus
7efcfd055f Replace TSPlayer.IgnoreActionsForCheating w/ boolean
This replaces IgnoreActionsForCheating in TSPlayer with a new
IsDisabledForStackDetection field that tracks the same basic data.

The previous way we did this was storing a string as the "reason"
why a player was disabled for cheating, but it only stored the last
hacked item stack that caused the check to fail. Since we already
have OnSecondUpdate which notifies on _all_ items, we don't need
to store this info in such a useless way anyway. They'll find out
in one second what they need to remove in a more alarmist way.
2017-12-20 17:19:14 -07:00
Lucas Nicodemus
1ef28dfe0d Replace TSPlayer.IgnoreActionsForInventory => IsDisabledForSSC.
This is the first commit in a series to rewrite CheckIgnores()
into whatever its replacement becomes.

IgnoreActionsForInventory was probably used by the SSC system prior
to when we had in-game support for SSC (ergo, when we just checked
to make sure you had removed all items before joining and worked
our way up in inventory data to track it). I could be wrong about
this though.

Now, IsDisabledForSSC tracks only if a player is shut down due to
SSC, rather than a reason that gets broadcast.
2017-12-20 17:01:55 -07:00
Lucas Nicodemus
3a59280834 Pre-initialize TShock hooks for Register method
Hooks have this fancy .Register method when they're of type
HandlerList<Args> that high made but we never bother to initialize
any of them, so .Register doesn't work because it's null.

This solves that problem by just initializing all handlers. Thus,
.Register works, and thus, you can register hooks with priorities.
2017-12-20 12:35:42 -07:00
Lucas Nicodemus
713dd2614a Fix regression where Bouncer would create dupe items on drop 2017-12-17 12:40:24 -07:00
Lucas Nicodemus
263c0bc402 Revert "Bouncer: Handle case where prefix < 1"
This reverts commit 3f79a904da.

If prefix is < 1 and we block this event, clients can no longer
delete picked up items. This is what caused what Joshwoo reported.
2017-12-17 12:27:02 -07:00
Lucas Nicodemus
c1de974e16 Remove happiness.
http://rubyonrails.org/doctrine

The problem with most programmers is that they refuse to see any
logic in thinking about a problem from the other side, even just
once. You can't argue with someone over what opinionated "programmer
happiness" things are because logically you'll always be outmatched
with "well you can just do it this other way."

Take this example. How is !args.Player.HasProjectilePermission any
easier to understand than args.Player.LacksProjectilePermission?
 -> One is direct: it focuses on what a player doesn't have.
 -> The other is indirect: it's the inverse of have.

You can read one in a sentence and think "so if a player lacks a
permission then this happens" whereas the other is like "invert
if a player has a permission." In this soupy mess of a codebase
where you're trying to sort out what 300 magic numbers mean and
what everything else is trying to do, then it's kinda nice to
be able to read something and understand it immediately.
2017-12-17 01:10:32 -07:00
Lucas Nicodemus
0afcf0d248 Merge remote-tracking branch 'origin/general-devel' into fragments 2017-12-17 00:45:02 -07:00
Lucas Nicodemus
14a6338b73 Add a "remove from bouncer" todo item 2017-12-17 00:44:19 -07:00
Lucas Nicodemus
3f79a904da Bouncer: Handle case where prefix < 1 2017-12-17 00:39:22 -07:00
Lucas Nicodemus
b71458b293 Fix /setup not working with owner groups; update readme 2017-12-16 20:37:43 -07:00
Lucas Nicodemus
9d0c84fd13 Fix handler registration in Bouncer init constructor 2017-12-16 10:37:44 -07:00
Lucas Nicodemus
1e9532a316 Create TSPlayer.IsBouncerThrottled() to avoid code copypasta 2017-12-16 01:14:39 -07:00
Lucas Nicodemus
0260530848 Change Bouncer initialization to a more permanent home 2017-12-16 01:09:40 -07:00
Lucas Nicodemus
1bee289daf Move TShock.CheckIgnores(TSPlayer) -> TSPlayer.CheckIgnores()
Note: This method really sucks and needs to be rebuilt anyway.
2017-12-16 01:03:05 -07:00
Lucas Nicodemus
9f7c3ead09 Add & move OnPlaceItemFrame to Bouncer 2017-12-15 23:15:43 -07:00
Lucas Nicodemus
748d7f7fab Move OnGemLockToggle -> Bouncer 2017-12-15 22:58:41 -07:00
Lucas Nicodemus
de017f2d41 Create & move OnPlaceTileEntity to Bouncer; fix unreachable code 2017-12-15 22:51:07 -07:00
Lucas Nicodemus
64facfc10c Document internal mass wire op in Bouncer 2017-12-15 22:29:52 -07:00
Lucas Nicodemus
681f2a2432 Add & move OnMassWireOperation hook to Bouncer 2017-12-15 22:15:17 -07:00
Lucas Nicodemus
cdba07c62e Move OnPlayerAnimation to Bouncer 2017-12-15 21:50:20 -07:00
Lucas Nicodemus
d03e899452 dmg -> damage 2017-12-15 21:43:27 -07:00
Lucas Nicodemus
007c685c19 Move OnNPCStrike to Bouncer 2017-12-15 21:42:20 -07:00
Lucas Nicodemus
e8a3f87e23 Merge remote-tracking branch 'origin/general-devel' into fragments 2017-12-15 19:28:12 -07:00
Lucas Nicodemus
81db59d864
Merge branch 'general-devel' into sql_improve 2017-12-15 18:38:25 -07:00
Lucas Nicodemus
01d865fddc Move OnPlayerDamage to Bouncer
Remove reference to PlayerDamage v1 hook
2017-12-15 18:27:55 -07:00
Lucas Nicodemus
82e2ecb662 Move OnItemDrop to Bouncer 2017-12-15 18:11:35 -07:00
Lucas Nicodemus
5cdb38675c Move OnPlayerBuff logic to Bouncer 2017-12-15 17:51:16 -07:00
Lucas Nicodemus
c9955a74ec Document OnChestItemChange 2017-12-15 12:14:10 -07:00
Lucas Nicodemus
845fc3b7c8 Move OnChestItemChange to Bouncer
Fix issue where TShock didn't properly do anti-cheat on chest
item changes.
2017-12-15 12:12:21 -07:00
Lucas Nicodemus
943f86615a Move UpdateNPCHome to Bouncer 2017-12-14 20:46:26 -07:00
Lucas Nicodemus
be8cffddfd Move OnChestOpen to Bouncer 2017-12-14 20:31:54 -07:00
Lucas Nicodemus
863fa706c2 Document OnPlaceChest in Bouncer 2017-12-14 20:28:50 -07:00
Lucas Nicodemus
d67d3e66a6 Merge branch 'general-devel' into fragments 2017-12-14 20:21:20 -07:00