AstralTransRocketries/MCGalaxy
1
0
Fork 0
mirror of https://github.com/ClassiCube/MCGalaxy.git synced 2025-09-29 08:32:14 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com:UnknownShadow200/MCGalaxy

Browse Source
This commit is contained in:
UnknownShadow200 2016-03-04 21:34:51 +11:00
commit 7431c8c8e2
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Commands/other/CmdAscend.cs
View File

@ -31,7 +31,7 @@ namespace MCGalaxy.Commands
public override void Use(Player p, string message) public override void Use(Player p, string message)
{ {
ushort max = p.level.Length; ushort max = p.level.Height;
ushort posy = (ushort)(p.pos[1] / 32); ushort posy = (ushort)(p.pos[1] / 32);
bool found = false; bool found = false;
ushort xpos = (ushort)(p.pos[0] / 32); ushort xpos = (ushort)(p.pos[0] / 32);

4
Levels/Generator/RealisticMapGen.cs
View File

@ -305,11 +305,11 @@ namespace MCGalaxy {
} }
//Forces the edge of a map to slope lower for island map types //Forces the edge of a map to slope lower for island map types
float NegateEdge(ushort x, ushort y, Level Lvl) { float NegateEdge(ushort x, ushort z, Level Lvl) {
float tempx = 0.0f, tempy = 0.0f; float tempx = 0.0f, tempy = 0.0f;
float temp; float temp;
if (x != 0) { tempx = ((float)x / (float)Lvl.Width) * 0.5f; } if (x != 0) { tempx = ((float)x / (float)Lvl.Width) * 0.5f; }
if (y != 0) { tempy = ((float)y / (float)Lvl.Length) * 0.5f; } if (z != 0) { tempy = ((float)z / (float)Lvl.Length) * 0.5f; }
tempx = Math.Abs(tempx - 0.25f); tempx = Math.Abs(tempx - 0.25f);
tempy = Math.Abs(tempy - 0.25f); tempy = Math.Abs(tempy - 0.25f);

2
Network/Player.Networking.cs
View File

@ -285,7 +285,7 @@ namespace MCGalaxy {
else else
NetUtils.WriteAscii(Server.motd, buffer, 66); NetUtils.WriteAscii(Server.motd, buffer, 66);
} else { } else {
NetUtils.WriteAscii(level.motd, buffer, 1); NetUtils.WriteAscii(level.motd, buffer, 2);
if (level.motd.Length > 64) if (level.motd.Length > 64)
NetUtils.WriteAscii(level.motd.Substring(64), buffer, 66); NetUtils.WriteAscii(level.motd.Substring(64), buffer, 66);
} }