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

Merge branch 'general-devel' of github.com:TShock/TShock into general-devel

Browse source
This commit is contained in:
Lucas Nicodemus 2012-01-06 17:27:23 -07:00
commit 340c0515ea
2 changed files with 8 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

7
TShockAPI/GetDataHandlers.cs
View file

@ -698,7 +698,8 @@ namespace TShockAPI
{PacketTypes.PlayerAnimation, HandlePlayerAnimation}, {PacketTypes.PlayerAnimation, HandlePlayerAnimation},
{PacketTypes.PlayerBuff, HandlePlayerBuffUpdate}, {PacketTypes.PlayerBuff, HandlePlayerBuffUpdate},
{PacketTypes.PasswordSend, HandlePassword}, {PacketTypes.PasswordSend, HandlePassword},
{PacketTypes.ContinueConnecting2, HandleConnecting} {PacketTypes.ContinueConnecting2, HandleConnecting},
{PacketTypes.ProjectileDestroy, HandleProjectileKill}
}; };
} }
@ -1050,11 +1051,11 @@ namespace TShockAPI
var tile = Main.tile[realx, realy]; var tile = Main.tile[realx, realy];
var newtile = tiles[x, y]; var newtile = tiles[x, y];
if (TShock.CheckTilePermission(args.Player, x, y)) if (TShock.CheckTilePermission(args.Player, realx, realy))
{ {
continue; continue;
} }
if (TShock.CheckRangePermission(args.Player, x, y)) if (TShock.CheckRangePermission(args.Player, realx, realy))
{ {
continue; continue;
} }

8
TShockAPI/Rest/RestManager.cs
View file

@ -428,11 +428,11 @@ namespace TShockAPI
private object WorldMeteor(RestVerbs verbs, IParameterCollection parameters) private object WorldMeteor(RestVerbs verbs, IParameterCollection parameters)
{ {
if (WorldGen.genRand == null)
WorldGen.genRand = new Random();
WorldGen.dropMeteor(); WorldGen.dropMeteor();
var returnBlock = new Dictionary<string, string>(); var returnBlock = new Dictionary<string, string> {{"status", "200"}, {"response", "Meteor has been spawned."}};
returnBlock.Add("status", "200"); return returnBlock;
returnBlock.Add("response", "Meteor has been spawned.");
return returnBlock;
} }
private object WorldBloodmoon(RestVerbs verbs, IParameterCollection parameters) private object WorldBloodmoon(RestVerbs verbs, IParameterCollection parameters)