themaster1970sf/TShock
1
0
Fork 0
Code Issues Pull requests Projects Releases 1 Packages Wiki Activity Actions

Merge branch 'general-devel' into patch-17

Browse source
This commit is contained in:
Chris 2020-06-07 12:36:42 +09:30 • committed by GitHub
commit ce21d56b86
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 22 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

4
TShockAPI/Bouncer.cs
View file

@ -1906,8 +1906,8 @@ namespace TShockAPI
/// <param name="args"></param>
internal void OnFishOutNPC(object sender, GetDataHandlers.FishOutNPCEventArgs args)
{
/// Getting recent projectiles of the player which are named Bobber. All bobbers have the same Name.
var projectile = args.Player.RecentlyCreatedProjectiles.FirstOrDefault(p => Main.projectile[p.Index].Name == "Bobber");
/// Getting recent projectiles of the player and selecting the first that is a bobber.
var projectile = args.Player.RecentlyCreatedProjectiles.FirstOrDefault(p => Main.projectile[p.Index].bobber);
if (!FishingRodItemIDs.Contains(args.Player.SelectedItem.type))
{

35
TShockAPI/DB/GroupManager.cs
View file

@ -76,7 +76,8 @@ namespace TShockAPI.DB
Permissions.summonboss,
Permissions.whisper,
Permissions.wormhole,
Permissions.canpaint));
Permissions.canpaint,
Permissions.pylon));
AddDefaultGroup("vip", "default",
string.Join(",",
@ -123,7 +124,8 @@ namespace TShockAPI.DB
Permissions.tpnpc,
Permissions.tppos,
Permissions.tpsilent,
Permissions.userinfo));
Permissions.userinfo,
Permissions.spawn));
AddDefaultGroup("trustedadmin", "admin",
string.Join(",",
@ -155,7 +157,20 @@ namespace TShockAPI.DB
Permissions.invade,
Permissions.startdd2,
Permissions.uploaddata,
Permissions.uploadothersdata));
Permissions.uploadothersdata,
Permissions.journey_timefreeze,
Permissions.journey_timeset,
Permissions.journey_timespeed,
Permissions.journey_godmode,
Permissions.journey_windstrength,
Permissions.journey_windfreeze,
Permissions.journey_rainstrength,
Permissions.journey_rainfreeze,
Permissions.journey_placementrange,
Permissions.journey_setdifficulty,
Permissions.journey_biomespreadfreeze,
Permissions.journey_setspawnrate,
Permissions.journey_contributeresearch));
AddDefaultGroup("owner", "trustedadmin",
string.Join(",",
@ -174,19 +189,7 @@ namespace TShockAPI.DB
Permissions.settempgroup,
Permissions.spawnrate,
Permissions.tpoverride,
Permissions.createdumps,
Permissions.journey_timefreeze,
Permissions.journey_timeset,
Permissions.journey_timespeed,
Permissions.journey_godmode,
Permissions.journey_windstrength,
Permissions.journey_windfreeze,
Permissions.journey_rainstrength,
Permissions.journey_rainfreeze,
Permissions.journey_placementrange,
Permissions.journey_setdifficulty,
Permissions.journey_biomespreadfreeze,
Permissions.journey_setspawnrate));
Permissions.createdumps));
}
// Load Permissions from the DB