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

Fix eclipses not being sent, enable certain SSC functions if Main.ServerSideCharacter instead

Browse source
This commit is contained in:
MarioE 2014-06-24 00:28:01 -04:00
parent 5225a55e76
commit 10634c4621
4 changed files with 4 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
TShockAPI/Commands.cs
View file

@ -4171,7 +4171,7 @@ namespace TShockAPI
{ {
var ply = players[0]; var ply = players[0];
if (ply.IsLoggedIn && TShock.Config.ServerSideCharacter) if (ply.IsLoggedIn && Main.ServerSideCharacter)
{ {
ply.TPlayer.velocity.Y = -50; ply.TPlayer.velocity.Y = -50;
TSPlayer.All.SendData(PacketTypes.PlayerUpdate, "", ply.Index); TSPlayer.All.SendData(PacketTypes.PlayerUpdate, "", ply.Index);

2
TShockAPI/GetDataHandlers.cs
View file

@ -2352,7 +2352,7 @@ namespace TShockAPI
} }
if (args.Player.Confused && TShock.Config.ServerSideCharacter && args.Player.IsLoggedIn) if (args.Player.Confused && Main.ServerSideCharacter && args.Player.IsLoggedIn)
{ {
if (args.TPlayer.controlUp) if (args.TPlayer.controlUp)
{ {

1
TShockAPI/TSPlayer.cs
View file

@ -534,6 +534,7 @@ namespace TShockAPI
DayTime = Main.dayTime, DayTime = Main.dayTime,
MoonPhase = (byte)Main.moonPhase, MoonPhase = (byte)Main.moonPhase,
BloodMoon = Main.bloodMoon, BloodMoon = Main.bloodMoon,
Eclipse = Main.eclipse,
MaxTilesX = (short)Main.maxTilesX, MaxTilesX = (short)Main.maxTilesX,
MaxTilesY = (short)Main.maxTilesY, MaxTilesY = (short)Main.maxTilesY,
SpawnX = (short)Main.spawnTileX, SpawnX = (short)Main.spawnTileX,

1
TShockAPI/TShock.cs
View file

@ -1367,6 +1367,7 @@ namespace TShockAPI
DayTime = Main.dayTime, DayTime = Main.dayTime,
MoonPhase = (byte)Main.moonPhase, MoonPhase = (byte)Main.moonPhase,
BloodMoon = Main.bloodMoon, BloodMoon = Main.bloodMoon,
Eclipse = Main.eclipse,
MaxTilesX = (short)Main.maxTilesX, MaxTilesX = (short)Main.maxTilesX,
MaxTilesY = (short)Main.maxTilesY, MaxTilesY = (short)Main.maxTilesY,
SpawnX = (short)Main.spawnTileX, SpawnX = (short)Main.spawnTileX,