themaster1970sf/TShock
1
0
Fork 0
Code Issues Pull requests Projects Releases 1 Packages Wiki Activity Actions
5011 commits 1 branch 1 tag 88 MiB
Commit graph

5011 commits

This branch
This branch
All branches
Author SHA1 Message Date
Lucas Nicodemus
619c3d4f75 Rename TSAPI to TSAPI in git submodule file 
For the purposes of making it easier to understand, the Terraria Server
API is now being called "TShock Scaffold API." This is actually just an
elaborate measure so that TSAPI can be called TSAPI but to alleviate
some confusion.
 2021-05-19 23:58:07 -07:00
Lucas Nicodemus
154456bbb5 Update submodule for TSAPI to fix #2304 2021-05-19 23:51:34 -07:00
Lucas Nicodemus
439dc6a0eb
Merge pull request #2314 from moisterrific/patch-25 
Add tele potion and conch perms to default
 2021-05-18 23:22:09 -07:00
Chris
4b3125b8db
Merge branch 'general-devel' into patch-25 2021-05-19 15:50:05 +09:30
Lucas Nicodemus
d82db22e5d Tick submodule for 1.4.2.3 2021-05-16 19:17:51 -07:00
stacey
62d15cf445
Add tele potion and conch perms to default 2021-05-16 20:57:26 -04:00
Chris
356cdaa7ad
Merge pull request #2299 from moisterrific/patch-20 
Update HealOtherPlayer check to respect ignoredamagecap permission
 2021-05-13 17:43:34 +09:30
stacey
b98c6aa282
fix typo 
oops sorry
 2021-05-12 12:35:15 -04:00
stacey
e7807f6378
improved the code 2021-05-12 12:18:53 -04:00
stacey
708b455d6b
Add HealOtherCheck to changelog 2021-05-12 12:13:23 -04:00
stacey
10318f032a
Improve HealOtherPlayer 0.2 check 
Since this check is based on damage and healing amount is based on 20% of the damage, it makes more sense to skip the check if the player has ignoredamagecap (trustedadmin and higher).
 2021-05-12 12:09:11 -04:00
Chris
563c439aee
Merge pull request #2297 from drunderscore/feature/additional-tp-permissions 
Implement additional teleport permissions
 2021-05-12 08:54:06 +09:30
James Puleo
b3cf5f4e43
Implement additional teleport permissions. 
This adds the follows permissions to the following items:
- tshock.tp.tppotion:   Teleportation Potion
- tshock.tp.magicconch:  Magic Conch
- tshock.tp.demonconch: Demon Conch
 2021-05-11 14:17:36 -04:00
Chris
19cc3f9b4c Update changelog for new REST perm 2021-04-22 17:28:16 +09:30
Lucas Nicodemus
77e5dfc679
Merge pull request #2219 from TheBambino/rest-permissions 
Permission added to REST Server Broadcast .
 2021-04-22 00:56:27 -07:00
Chris
d92bfc0f65
Merge branch 'general-devel' into rest-permissions 2021-04-22 16:52:55 +09:30
Chris
174b759eee
Merge pull request #2250 from Pryaxis/pscheck 
Implement place style checks, courtesy of @AgaSpace
 2021-04-22 13:20:40 +09:30
Chris
76ea1760fd
Merge branch 'general-devel' into pscheck 2021-04-22 13:16:40 +09:30
Lucas Nicodemus
8a3a339976
Fix silly changelog typo 2021-04-21 20:22:11 -07:00
Lucas Nicodemus
6bb4230bc3 Remove /ungodme 
With 1.4.2.2, we no longer need to offer an escape hatch due to the
underlying bug involving godmode being permanently applied to local
players now having been fixed.
 2021-04-21 20:16:57 -07:00
Lucas Nicodemus
4668ab86a0 Version tick: 4.5.2 2021-04-21 19:58:36 -07:00
Lucas Nicodemus
fb62110b76 Add preliminary support for Terraria 1.4.2.2 2021-04-21 19:43:35 -07:00
Lucas Nicodemus
f8c265d74c Version tick: 4.5.1 2021-04-19 10:54:12 -07:00
Chris
01fc41968d Refactor wallow command & update changelog 2021-04-19 22:04:41 +09:30
Chris
0b890f9507 Merge branch 'general-devel' of https://github.com/Pryaxis/TShock into general-devel 2021-04-19 21:48:37 +09:30
Chris
e80f0bfda5 Add ban ticket ID to ban messages 2021-04-19 21:48:34 +09:30
Lucas Nicodemus
61cd7f8ef0
Merge pull request #2278 from bartico6/fix-reply-to-offline-players 
Fix /r against offline players.
 2021-04-17 02:55:06 -07:00
quake1337
663041e8b0 Fix /r against offline players. 
- Offline players will no longer be valid /r targets.
 2021-04-17 10:11:49 +02:00
Lucas Nicodemus
6f95b684d4
Merge pull request #2276 from bartico6/new-godmode 
Update /godmode
 2021-04-16 02:44:35 -07:00
quake1337
3e40ade0ca Added feedback to /ungodme 
- The command now tells the user that the operation succeeded.
  Previously it would be a silent command, potentially leaving the user
  wondering if it worked
 2021-04-16 10:18:40 +02:00
quake1337
78b72df79d Address JourneyMode Godmode issues 
- Add /ungodme to allow unstucking godmode for involuntarily godmodded
  characters
- Warn player about disabling Godmode before disconnecting
- Minor change to command format to reduce code copypaste.
 2021-04-16 10:14:46 +02:00
quake1337
4a28d6779f Update casing & remove using static 
- god_power -> godPower
- Remove using static on GameContent.CreativePowers, instead fully
  qualify the nested class.
 2021-04-16 07:01:11 +02:00
quake1337
3b58b0ad16 Update changelog 2021-04-16 06:30:12 +02:00
quake1337
207b43e772 Update /godmode to use JourneyMode Godmode power. 
- Previous Bouncer checks for GodMode (namely, Hurt) were removed.
- The command now uses the GodmodePower from core Terraria
- The toggle powers (which this command will now make use of) are now
  reset on disconnect to prevent accidentally "gifting" godmode to an
  unsuspecting player.
 2021-04-16 06:11:26 +02:00
Chris
3664b81c3f
Merge branch 'general-devel' into pscheck 2021-04-13 16:32:14 +09:30
Lucas Nicodemus
173d6f71f5
Update changelog 2021-04-12 23:21:51 -07:00
Lucas Nicodemus
00b4eb6774
Update changelog 2021-04-12 23:20:10 -07:00
Chris
c72e64fa5e Add silent command support to spawnboss 2021-04-13 15:15:49 +09:30
Chris
196a16c321 Changelog update 2021-04-13 13:59:56 +09:30
Chris
784a75b7c5 Implement handled pattern on the PlayerChat hook 2021-04-13 13:14:56 +09:30
Chris
32a0e2f1b6 Resolve /v2/players/list generating a stack overflow 2021-04-13 13:06:18 +09:30
Lucas Nicodemus
099256bdba Normalize changelog 2021-04-12 11:09:58 -07:00
Lucas Nicodemus
5a3048e24f Merge branch 'h/fix-typo' into general-devel 2021-04-12 11:03:48 -07:00
Lucas Nicodemus
93e13c167b
Merge pull request #2271 from DeathCradle/h/fix-typo 
Fix ban system
 2021-04-12 11:02:48 -07:00
Luke
71e2ae1b31 Corrected UUID InsertBan in TSPlayer 
Pointed out thanks to this discussion: https://github.com/Pryaxis/TShock/discussions/2268#discussioncomment-598331
 2021-04-12 17:35:46 +10:00
Lucas Nicodemus
070787ed96
Merge pull request #2269 from Pryaxis/h/fix-typo 
Fix (partial) ban system conversion issue with MySQL
 2021-04-11 22:06:37 -07:00
Luke
29e55a866d Update CHANGELOG.md 2021-04-11 21:18:52 +10:00
Luke
d0ce5746ea Fix mysql & sqlite ban manager migration during init 
Tested with existing bans in both sqlite & mysql environments.
This is in addition to the syntax fix from earlier.
 2021-04-11 21:18:37 +10:00
Luke
81b6872d6e Fix OTAPI reference 
This now allows MonoDevelop to compile without receiving error while starting a build: System.IO.FileLoadException: The assembly name is invalid
 2021-04-11 21:00:28 +10:00
Lucas Nicodemus
78eab01904 Fix ban system conversion issue with MySQL 
DeathCradle spotted a typo in the ban converter and identified that the
issue is likely because we used table_name in some, but not all, of the
conversion SQL.

Co-authored-by: DeathCradle <rt.luke.s@gmail.com>
 2021-04-11 00:12:28 -07:00