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

Merge branch 'general-devel' into fix-1904

Browse source
This commit is contained in:
Lucas Nicodemus 2020-05-25 00:17:35 -07:00 • committed by GitHub
commit e9ded60396
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
6 changed files with 189 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

40
TShockAPI/GetDataHandlers.cs
View file

@ -39,6 +39,8 @@ using TShockAPI.Localization;
using TShockAPI.Models;
using TShockAPI.Models.PlayerUpdate;
using TShockAPI.Models.Projectiles;
using Terraria.Net;
using Terraria.GameContent.NetModules;
namespace TShockAPI
{
@ -3135,7 +3137,7 @@ namespace TShockAPI
{
if (!args.Player.HasPermission(Permissions.journey_timefreeze))
{
args.Player.SendErrorMessage("You have no permission to freeze the time of the server!");
args.Player.SendErrorMessage("You don't have permission to freeze the time of the server!");
return true;
}
break;
@ -3147,7 +3149,7 @@ namespace TShockAPI
{
if (!args.Player.HasPermission(Permissions.journey_timeset))
{
args.Player.SendErrorMessage("You have no permission to modify the time of the server!");
args.Player.SendErrorMessage("You don't have permission to modify the time of the server!");
return true;
}
break;
@ -3156,7 +3158,7 @@ namespace TShockAPI
{
if (!args.Player.HasPermission(Permissions.journey_godmode))
{
args.Player.SendErrorMessage("You have no permission to toggle godmode!");
args.Player.SendErrorMessage("You don't have permission to toggle godmode!");
return true;
}
break;
@ -3165,7 +3167,7 @@ namespace TShockAPI
{
if (!args.Player.HasPermission(Permissions.journey_windstrength))
{
args.Player.SendErrorMessage("You have no permission to modify the wind strength of the server!");
args.Player.SendErrorMessage("You don't have permission to modify the wind strength of the server!");
return true;
}
break;
@ -3174,7 +3176,7 @@ namespace TShockAPI
{
if (!args.Player.HasPermission(Permissions.journey_rainstrength))
{
args.Player.SendErrorMessage("You have no permission to modify the rain strength of the server!");
args.Player.SendErrorMessage("You don't have permission to modify the rain strength of the server!");
return true;
}
break;
@ -3183,7 +3185,7 @@ namespace TShockAPI
{
if (!args.Player.HasPermission(Permissions.journey_timespeed))
{
args.Player.SendErrorMessage("You have no permission to modify the time speed of the server!");
args.Player.SendErrorMessage("You don't have permission to modify the time speed of the server!");
return true;
}
break;
@ -3192,7 +3194,7 @@ namespace TShockAPI
{
if (!args.Player.HasPermission(Permissions.journey_rainfreeze))
{
args.Player.SendErrorMessage("You have no permission to freeze the rain strength of the server!");
args.Player.SendErrorMessage("You don't have permission to freeze the rain strength of the server!");
return true;
}
break;
@ -3201,7 +3203,7 @@ namespace TShockAPI
{
if (!args.Player.HasPermission(Permissions.journey_windfreeze))
{
args.Player.SendErrorMessage("You have no permission to freeze the wind strength of the server!");
args.Player.SendErrorMessage("You don't have permission to freeze the wind strength of the server!");
return true;
}
break;
@ -3210,7 +3212,7 @@ namespace TShockAPI
{
if (!args.Player.HasPermission(Permissions.journey_placementrange))
{
args.Player.SendErrorMessage("You have no permission to modify the tile placement range of your character!");
args.Player.SendErrorMessage("You don't have permission to modify the tile placement range of your character!");
return true;
}
break;
@ -3219,7 +3221,7 @@ namespace TShockAPI
{
if (!args.Player.HasPermission(Permissions.journey_setdifficulty))
{
args.Player.SendErrorMessage("You have no permission to modify the world dificulty of the server!");
args.Player.SendErrorMessage("You don't have permission to modify the world dificulty of the server!");
return true;
}
break;
@ -3228,7 +3230,7 @@ namespace TShockAPI
{
if (!args.Player.HasPermission(Permissions.journey_biomespreadfreeze))
{
args.Player.SendErrorMessage("You have no permission to freeze the biome spread of server!");
args.Player.SendErrorMessage("You don't have permission to freeze the biome spread of server!");
return true;
}
break;
@ -3237,7 +3239,7 @@ namespace TShockAPI
{
if (!args.Player.HasPermission(Permissions.journey_setspawnrate))
{
args.Player.SendErrorMessage("You have no permission to modify the NPC spawn rate of server!");
args.Player.SendErrorMessage("You don't have permission to modify the NPC spawn rate of server!");
return true;
}
break;
@ -3247,6 +3249,20 @@ namespace TShockAPI
return true;
}
}
} else if (moduleId == (int)NetModulesTypes.CreativeUnlocksPlayerReport)
{
var unknownField = args.Data.ReadByte();
if (unknownField == 0) //this is required or something???
{
var itemId = args.Data.ReadUInt16();
var amount = args.Data.ReadUInt16();
var totalSacrificed = TShock.ResearchDatastore.SacrificeItem(itemId, amount, args.Player);
var response = NetCreativeUnlocksModule.SerializeItemSacrifice(itemId, totalSacrificed);
NetManager.Instance.Broadcast(response);
}
}
// As of 1.4.x.x, this is now used for more things: