Commit graph

4406 commits

Author SHA1 Message Date
鱼鱼
43f586cde5 Merge branch 'general-devel' of https://github.com/Pryaxis/TShock
 Conflicts:
	CHANGELOG.md
	TShockAPI/GetDataHandlers.cs
	TShockAPI/TShock.cs
2020-05-17 21:38:07 +08:00
Lucas Nicodemus
b5f95d5918
Fragments: Separate out item bans (#1595)
* Remove commented out warning disable

* Add initial ItemBans segregation infrastructure

* Add shell for initial OnSecondUpdate stuff

* Add comments yo

* Remove duplicated logic

* Split out more item ban code

This part of the fragments work is primarily aimed at reducing the
complexity of OnSecondUpdate in TShock and moving that check out into
the ItemBans subsytem.

Of major note in this is the removal of "check", which was a string
variable that tracked state and replacement of many of the item ban
activities with sane private methods that are at least somewhat
sensible. Obviously there's a lot to be desired in this system and I'm
really going for a run here by trying to continue a branch from so long
ago that I barely even remember the whole point of existence.

Still to do: GetDataHandlers related item ban code needs to be moved
into its own hook in the ItemBan system. Finally, there is a downside to
some of this: we're basically iterating over players again and again if
we keep this pattern up, which is kinda lame for complexity purposes.

* alt j: comment changes

* Move item ban check out of main playerupdate check

Separates out item ban logic from the rest of GetDataHandlers so that
item bans is more isolated in terms of what fragments is asking for.

* alt-j: convert indentation to tabs

* alt-j: fix botching source code

* Move item ban related chest checks out of gdh

* Remove chest item change detection from item bans

It doesn't do anything. If a user removes an item from a chest, it
bypasses this check. If a user adds an item to a chest, the server seems
to persist the change anyway, even if the event is handled. That's a bug
for sure, but fundamentally, it's not the item ban system's fault.

* Revert "Remove chest item change detection from item bans"

This reverts commit 758541ac5c4d4096df2db05ba2a398968113e1e4.

* Fix logic issues related to item ban handling

Re-implements chest item handling and correctly handles events and
returns after setting handled event state.

* Remove TSPlayer.HasProjectilePermission

In infinite wisdom, it turns out this is not a good method for TSPlayer
to have. It just checks the states of things as per what the item ban
system says is banned and then creates implicit relationships to the
projectile ban system.

Doing this effectively knocks down another external reference to the
item ban system outside of the context of the implementation for the
system itself and its related hooks.

This commit also adds context around what the heck is going on with some
of our more interesting checks as per discussions in Telegram with @Ijwu
and @QuiCM.

* Update changelog

* Remove useless ref to Projectile.SetDefaults

* Change item ban to ban based on ID not strings

I think I was so confused as to why we were passing strings everywhere
that I just felt inclined to continue the trend in previous commits.
2020-05-16 16:27:34 -07:00
Lucas Nicodemus
ab99c48212
Update readme version verbiage 2020-05-16 09:55:36 -07:00
Lucas Nicodemus
d67cfbe11c
Normalize chat links on readme 2020-05-16 09:41:11 -07:00
Lucas Nicodemus
12a8f576a0
Update readme with 1.4.0.0 update announcement 2020-05-16 09:40:16 -07:00
Zetten Wang
33c5e01654
Merge pull request #1743 from Pryaxis/h/fix-addperms
Provide warning message on invalid group command
2020-05-14 13:56:13 -07:00
Lucas Nicodemus
76150e2500
Provide warning message on invalid group command
This fixes #1742 where users could run group commands that didn't exist
and the server would silently fail rather than giving an error.
2020-05-13 21:10:01 -07:00
Lucas Nicodemus
86ec030488
Merge pull request #1725 from Pryaxis/update-issue-template
Update issue template
2020-05-04 03:44:13 -07:00
Axeel
90e9bb248b
Update issue template
make qq link more descriptive
2020-05-04 18:40:59 +08:00
Lucas Nicodemus
438c75a21d
Add issue template config file 2020-04-30 22:37:47 -07:00
Lucas Nicodemus
219255b418 Add new issue template system 2020-04-30 22:31:21 -07:00
Lucas Nicodemus
7c5ed2d7bd
Merge pull request #1712 from Pryaxis/all-contributors/add-AxeelAnder
docs: add AxeelAnder as a contributor
2020-04-26 20:10:02 -07:00
allcontributors[bot]
e187cc979e
docs: update .all-contributorsrc [skip ci] 2020-04-27 03:09:18 +00:00
allcontributors[bot]
30b3b11db4
docs: update README_cn.md [skip ci] 2020-04-27 03:09:17 +00:00
allcontributors[bot]
d7e3497604
docs: update README.md [skip ci] 2020-04-27 03:09:16 +00:00
Lucas Nicodemus
b4a9bbaca3
Merge pull request #1711 from AxeelAnder/general-devel
Add chinese translation of readme
2020-04-26 20:04:32 -07:00
Axeel
19236ad989
Update .all-contributorsrc 2020-04-27 10:36:18 +08:00
Axeel
6f5283fef2
Add cn readme link in readme 2020-04-27 10:32:31 +08:00
Axeel
486829beb8
Add chinese version readme 2020-04-27 10:23:31 +08:00
Axeel
a847c29530
Merge pull request #2 from Pryaxis/general-devel
update
2020-04-27 10:18:14 +08:00
Chris
08aaa1e947
Merge pull request #1691 from Pryaxis/build-debugs
Publish artifacts in github for debug builds from CI
2020-02-12 03:37:44 +00:00
Lucas Nicodemus
df24792352
Publish artifacts in github for debug builds from CI
It's helpful to have debug builds available for people to download if
they need it.
2020-02-11 19:19:28 -08:00
Chris
9c805c0e7e Merge pull request #1690 from Pryaxis/remove-travis
Remove Travis CI integration
2020-02-10 05:49:04 +00:00
Lucas Nicodemus
e3301d04ef
Merge branch 'remove-travis' of github.com:Pryaxis/TShock into remove-travis 2020-02-09 21:45:26 -08:00
Lucas Nicodemus
11d2d63c20
∆: update readme with exp download docs 2020-02-09 21:45:07 -08:00
Lucas Nicodemus
484eccff2c Merge branch 'general-devel' into remove-travis 2020-02-09 21:32:06 -08:00
Chris
7028e3f3fc Merge pull request #1689 from Pryaxis/fix-msbuild-installer
Fix GitHub Actions with updated Windows Server 2019 builder
2020-02-10 05:31:18 +00:00
Lucas Nicodemus
64b2e532be
Remove Travis CI integration
Travis CI is not really worth having around when it doesn't work at all
anymore.
2020-02-09 21:30:22 -08:00
Lucas Nicodemus
c1811b3afb
Fix GitHub Actions with updated Windows Server 2019 builder
This changeset fixes several problems with the github actions build. It
removes the dependency on a repo script to install msbuild + VS. It
switches the shell back to cmd.exe, so that the scripts in build.yml
continue to run. It installs nuget via chocolatey, since that's not on
the path by default. Finally, it also uses built in MSBUILD to satisfy
the first statement.
2020-02-09 21:22:29 -08:00
Lucas Nicodemus
8bc31eed0a Use checkout@v1 instead of v2 for github actions
Checkout v1 supports submodules -- master (v2) does not.
2020-02-09 20:27:57 -08:00
Chris
20dab56407 Merge pull request #1686 from moisterrific/patch-2
Fix BoC false positive kick in NPCAddBuffTimeMax
2020-02-09 23:07:00 +00:00
moisterrific
6007edeb77
Fix BoC false positive kick in NPCAddBuffTimeMax
360 ticks = 6 seconds, according to the wiki, the max possible duration is proportional to dmg taken, so 7.5 seconds would be the max duration (aka 450 ticks)
2020-02-07 16:14:27 -05:00
Chris
ef17fe2262
Merge pull request #1685 from moisterrific/patch-1
Fix for Vortex armor set stealth flicker bug...again
2020-01-19 16:37:15 +10:30
moisterrific
f50aba8ba6
Fix for Vortex armor set stealth flicker bug
tests on my end showed it fixed, plz confirm as well
2020-01-10 17:55:49 -05:00
Lucas Nicodemus
0ac7e39718
Merge pull request #1682 from Pryaxis/all-contributors/add-sgkoishi
docs: add sgkoishi as a contributor
2019-10-03 06:54:04 -07:00
allcontributors[bot]
260600b15f
docs: update .all-contributorsrc 2019-10-03 13:40:04 +00:00
allcontributors[bot]
4037a9e7ff
docs: update README.md 2019-10-03 13:40:03 +00:00
Lucas Nicodemus
9901281669
Merge pull request #1681 from sgkoishi/general-devel
Add GitHub Actions build
2019-10-03 06:39:38 -07:00
SGKoishi
8edea2c4d0
Fix the space in url 2019-10-02 16:58:08 -07:00
SGKoishi
1915d69f08
Rename the action to Build Server 2019-10-02 16:56:50 -07:00
SGKoishi
fdbc958b34
Include the download script 2019-10-02 16:29:26 -07:00
SGKoishi
79b092b9c1
Add GitHub Actions build script and badge 2019-10-02 14:01:46 -07:00
Lucas Nicodemus
af6e42292b
Delete old github actions workflow
Apparently now we've been upgraded?
2019-09-04 22:21:02 -07:00
Lucas Nicodemus
5788c40aba
Create old style github actions workflow?
Does anything here work?
2019-09-04 22:19:12 -07:00
Lucas Nicodemus
6fb2d7b585
Move test action to workflows folder 2019-09-04 22:15:19 -07:00
Lucas Nicodemus
b40a6f41c2
Create msbuild-test.yml github action
This tests out the github actions system, which is quite weird and undocumented. It says this only works with .NET core by default but also supports "4.5.1" as a version. It also says we aren't in the right github actions beta, so this shouldn't work at all.
2019-09-04 22:12:03 -07:00
Chris
e3bac1871a
Update Bouncer.cs
Removes double occurrence of daybreak buff from dictionary.
Thanks for pointing this out @AxeelAnder
2019-07-18 13:54:20 +00:00
Lucas Nicodemus
38e781caa5
Merge pull request #1672 from Pryaxis/all-contributors/add-AxisKriel
docs: add AxisKriel as a contributor
2019-06-05 06:32:42 -07:00
allcontributors[bot]
f46808476c docs: update .all-contributorsrc 2019-06-05 13:31:50 +00:00
allcontributors[bot]
15bd8e59bd docs: update README.md 2019-06-05 13:31:49 +00:00