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

Did stuff

Browse Source
This commit is contained in:
Hetal728 2015-03-21 17:15:24 -04:00
parent 674ebcfd42
commit 3bd803449c
7 changed files with 182 additions and 107 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
GUI/Program.cs
View File

@ -554,7 +554,6 @@ namespace MCGalaxy_.Gui
if (Player.players != null && Player.players.Any()) if (Player.players != null && Player.players.Any())
foreach (Player pl in Player.players) pl.save(); foreach (Player pl in Player.players) pl.save();
File.WriteAllBytes("Updater.exe", MCGalaxy.Properties.Resources.Updater);
if (!usingConsole) if (!usingConsole)
Process.Start("Updater.exe", "securitycheck10934579068013978427893755755270374" + parent); Process.Start("Updater.exe", "securitycheck10934579068013978427893755755270374" + parent);
else else

32
Levels/Level.cs
View File

@ -1634,7 +1634,7 @@ namespace MCGalaxy
public void CalcPhysics() public void CalcPhysics()
{ {
/*try try
{ {
if (physics == 5) if (physics == 5)
{ {
@ -1781,20 +1781,6 @@ namespace MCGalaxy
case Block.door_cobblestone_air: case Block.door_cobblestone_air:
case Block.door_red_air: case Block.door_red_air:
case Block.door_orange_air:
case Block.door_yellow_air:
case Block.door_lightgreen_air:
case Block.door_aquagreen_air:
case Block.door_cyan_air:
case Block.door_lightblue_air:
case Block.door_purple_air:
case Block.door_lightpurple_air:
case Block.door_pink_air:
case Block.door_darkpink_air:
case Block.door_darkgrey_air:
case Block.door_lightgrey_air:
case Block.door_white_air:
case Block.door_dirt_air: case Block.door_dirt_air:
case Block.door_grass_air: case Block.door_grass_air:
case Block.door_blue_air: case Block.door_blue_air:
@ -3189,20 +3175,6 @@ namespace MCGalaxy
case Block.door_cobblestone_air: case Block.door_cobblestone_air:
case Block.door_red_air: case Block.door_red_air:
case Block.door_orange_air:
case Block.door_yellow_air:
case Block.door_lightgreen_air:
case Block.door_aquagreen_air:
case Block.door_cyan_air:
case Block.door_lightblue_air:
case Block.door_purple_air:
case Block.door_lightpurple_air:
case Block.door_pink_air:
case Block.door_darkpink_air:
case Block.door_darkgrey_air:
case Block.door_lightgrey_air:
case Block.door_white_air:
case Block.door_dirt_air: case Block.door_dirt_air:
case Block.door_grass_air: case Block.door_grass_air:
case Block.door_blue_air: case Block.door_blue_air:
@ -5231,7 +5203,7 @@ namespace MCGalaxy
{ {
Server.s.Log("Level physics error"); Server.s.Log("Level physics error");
Server.ErrorLog(e); Server.ErrorLog(e);
}*/ }
} }
public void AddCheck(int b, string extraInfo = "", bool overRide = false, MCGalaxy.Player Placer = null) public void AddCheck(int b, string extraInfo = "", bool overRide = false, MCGalaxy.Player Placer = null)

2
MCGalaxy_.csproj
View File

@ -612,6 +612,8 @@
<Compile Include="Commands\CmdCtf.cs" /> <Compile Include="Commands\CmdCtf.cs" />
<Compile Include="properties\Resources.Designer.cs"> <Compile Include="properties\Resources.Designer.cs">
<DependentUpon>Resources.resx</DependentUpon> <DependentUpon>Resources.resx</DependentUpon>
<AutoGen>True</AutoGen>
<DesignTime>True</DesignTime>
</Compile> </Compile>
<Compile Include="util\ExtrasCollection.cs" /> <Compile Include="util\ExtrasCollection.cs" />
<Compile Include="Commands\cmdRestart.cs" /> <Compile Include="Commands\cmdRestart.cs" />

45
Player/Player.CPE.cs
View File

@ -41,6 +41,51 @@ namespace MCGalaxy
break; break;
case "ExtPlayerList": case "ExtPlayerList":
ExtPlayerList = version; ExtPlayerList = version;
spawned = true;
if (version > 0)
Player.players.ForEach(delegate(Player p)
{
if (p.HasExtension("ExtPlayerList", 2))
{
p.SendExtAddPlayerName(id, name, group, color + name);
}
if (HasExtension("ExtPlayerList", 2))
{
SendExtAddPlayerName(p.id, p.name, p.group, p.color + p.name);
}
});
try
{
ushort x = (ushort)((0.5 + level.spawnx) * 32);
ushort y = (ushort)((1 + level.spawny) * 32);
ushort z = (ushort)((0.5 + level.spawnz) * 32);
pos = new ushort[3] { x, y, z }; rot = new byte[2] { level.rotx, level.roty };
GlobalSpawn(this, x, y, z, rot[0], rot[1], true);
foreach (Player p in players)
{
if (p.level == level && p != this && !p.hidden)
SendSpawn(p.id, p.color + p.name, p.pos[0], p.pos[1], p.pos[2], p.rot[0], p.rot[1], p.DisplayName, p.SkinName);
if (HasExtension("ChangeModel"))
{
if (p == this)
unchecked { SendChangeModel((byte)-1, model); }
else SendChangeModel(p.id, p.model);
}
}
foreach (PlayerBot pB in PlayerBot.playerbots)
{
if (pB.level == level)
SendSpawn(pB.id, pB.color + pB.name, pB.pos[0], pB.pos[1], pB.pos[2], pB.rot[0], pB.rot[1], pB.name, pB.name);
}
}
catch (Exception e)
{
Server.ErrorLog(e);
Server.s.Log("Error spawning player \"" + name + "\"");
}
break; break;
case "EnvColors": case "EnvColors":
EnvColors = version; EnvColors = version;

151
Player/Player.cs
View File

@ -76,6 +76,7 @@ namespace MCGalaxy {
public string time; public string time;
public string name; public string name;
public string DisplayName = ""; public string DisplayName = "";
public string SkinName;
public string realName; public string realName;
public int warn = 0; public int warn = 0;
public byte id; public byte id;
@ -226,6 +227,9 @@ namespace MCGalaxy {
public int[] copyoffset = new int[3] { 0, 0, 0 }; public int[] copyoffset = new int[3] { 0, 0, 0 };
public ushort[] copystart = new ushort[3] { 0, 0, 0 }; public ushort[] copystart = new ushort[3] { 0, 0, 0 };
public string model = "humanoid";
public bool spawned = false;
public bool Mojangaccount { public bool Mojangaccount {
get { get {
return truename.Contains('@'); return truename.Contains('@');
@ -1054,29 +1058,6 @@ namespace MCGalaxy {
SetPrefix(); SetPrefix();
} }
try {
ushort x = (ushort)( ( 0.5 + level.spawnx ) * 32 );
ushort y = (ushort)( ( 1 + level.spawny ) * 32 );
ushort z = (ushort)( ( 0.5 + level.spawnz ) * 32 );
pos = new ushort[3] { x, y, z }; rot = new byte[2] { level.rotx, level.roty };
GlobalSpawn(this, x, y, z, rot[0], rot[1], true);
foreach ( Player p in players ) {
if ( p.level == level && p != this && !p.hidden )
SendSpawn(p.id, p.color + p.name, p.pos[0], p.pos[1], p.pos[2], p.rot[0], p.rot[1]);
}
foreach ( PlayerBot pB in PlayerBot.playerbots ) {
if ( pB.level == level )
SendSpawn(pB.id, pB.color + pB.name, pB.pos[0], pB.pos[1], pB.pos[2], pB.rot[0], pB.rot[1]);
}
}
catch ( Exception e ) {
Server.ErrorLog(e);
Server.s.Log("Error spawning player \"" + name + "\"");
}
Loading = false;
if ( Server.verifyadmins == true ) { if ( Server.verifyadmins == true ) {
if ( this.group.Permission >= Server.verifyadminsrank ) { if ( this.group.Permission >= Server.verifyadminsrank ) {
adminpen = true; adminpen = true;
@ -1190,6 +1171,35 @@ namespace MCGalaxy {
Server.s.Log(name + " [" + ip + "] has joined the server."); Server.s.Log(name + " [" + ip + "] has joined the server.");
if ( Server.zombie.ZombieStatus() != 0 ) { Player.SendMessage(this, "There is a Zombie Survival game currently in-progress! Join it by typing /g " + Server.zombie.currentLevelName); } if ( Server.zombie.ZombieStatus() != 0 ) { Player.SendMessage(this, "There is a Zombie Survival game currently in-progress! Join it by typing /g " + Server.zombie.currentLevelName); }
if (!spawned)
{
try
{
ushort x = (ushort)((0.5 + level.spawnx) * 32);
ushort y = (ushort)((1 + level.spawny) * 32);
ushort z = (ushort)((0.5 + level.spawnz) * 32);
pos = new ushort[3] { x, y, z }; rot = new byte[2] { level.rotx, level.roty };
GlobalSpawn(this, x, y, z, rot[0], rot[1], true);
foreach (Player p in players)
{
if (p.level == level && p != this && !p.hidden)
SendSpawn(p.id, p.color + p.name, p.pos[0], p.pos[1], p.pos[2], p.rot[0], p.rot[1]);
}
foreach (PlayerBot pB in PlayerBot.playerbots)
{
if (pB.level == level)
SendSpawn(pB.id, pB.color + pB.name, pB.pos[0], pB.pos[1], pB.pos[2], pB.rot[0], pB.rot[1]);
}
}
catch (Exception e)
{
Server.ErrorLog(e);
Server.s.Log("Error spawning player \"" + name + "\"");
}
spawned = true;
}
Loading = false;
} }
public void SetPrefix() { //just change the color name if someone ever decides these titles need different colors O.o I just try to match them with the ranks on comingsoon.tk public void SetPrefix() { //just change the color name if someone ever decides these titles need different colors O.o I just try to match them with the ranks on comingsoon.tk
@ -2497,11 +2507,15 @@ return;
for ( int i = 0; i < send.Length; i++ ) { for ( int i = 0; i < send.Length; i++ ) {
buffer[i + 1] = send[i]; buffer[i + 1] = send[i];
} }
try { if (id != 17)
{
try
{
socket.BeginSend(buffer, 0, buffer.Length, SocketFlags.None, delegate(IAsyncResult result) { }, null); socket.BeginSend(buffer, 0, buffer.Length, SocketFlags.None, delegate(IAsyncResult result) { }, null);
buffer = null; buffer = null;
} }
catch ( SocketException e ) { catch (SocketException e)
{
buffer = null; buffer = null;
Disconnect(); Disconnect();
#if DEBUG #if DEBUG
@ -2509,6 +2523,23 @@ return;
#endif #endif
} }
} }
else
{
try
{
socket.Send(buffer, 0, buffer.Length, SocketFlags.None);
buffer = null;
}
catch (SocketException e)
{
buffer = null;
Disconnect();
#if DEBUG
Server.ErrorLog(e);
#endif
}
}
}
/// <summary> /// <summary>
/// Send the client a sound/music /// Send the client a sound/music
@ -2827,9 +2858,15 @@ return;
//Server.s.Log((DateTime.Now - start).TotalMilliseconds.ToString()); // We dont want random numbers showing up do we? //Server.s.Log((DateTime.Now - start).TotalMilliseconds.ToString()); // We dont want random numbers showing up do we?
} }
} }
public void SendSpawn(byte id, string name, ushort x, ushort y, ushort z, byte rotx, byte roty) { public void SendSpawn(byte id, string name, ushort x, ushort y, ushort z, byte rotx, byte roty, string displayName = "", string skinName = "")
//pos = new ushort[3] { x, y, z }; // This could be remove and not effect the server :/ {
//rot = new byte[2] { rotx, roty }; if (displayName == "")
displayName = DisplayName;
if (skinName == "")
skinName = displayName;
if (!HasExtension("ExtPlayerList", 2))
{
Server.s.Log("Hi");
byte[] buffer = new byte[73]; buffer[0] = id; byte[] buffer = new byte[73]; buffer[0] = id;
StringFormat(name, 64).CopyTo(buffer, 1); StringFormat(name, 64).CopyTo(buffer, 1);
HTNO(x).CopyTo(buffer, 65); HTNO(x).CopyTo(buffer, 65);
@ -2838,6 +2875,36 @@ return;
buffer[71] = rotx; buffer[72] = roty; buffer[71] = rotx; buffer[72] = roty;
SendRaw(7, buffer); SendRaw(7, buffer);
} }
else
{
Server.s.Log("Test");
byte[] buffer = new byte[137];
buffer[0] = id;
StringFormat(displayName, 64).CopyTo(buffer, 1);
StringFormat(skinName, 64).CopyTo(buffer, 65);
HTNO(x).CopyTo(buffer, 129);
HTNO(y).CopyTo(buffer, 131);
HTNO(z).CopyTo(buffer, 133);
buffer[135] = rotx;
buffer[136] = roty;
SendRaw(33, buffer);
}
if (HasExtension("ChangeModel"))
{
Player.players.ForEach(p =>
{
if (p.level == this.level)
if (p == this) unchecked { SendChangeModel((byte)-1, model); }
else
{
SendChangeModel(p.id, p.model);
if (p.HasExtension("ChangeModel"))
p.SendChangeModel(this.id, model);
}
});
}
}
public void SendPos(byte id, ushort x, ushort y, ushort z, byte rotx, byte roty) { public void SendPos(byte id, ushort x, ushort y, ushort z, byte rotx, byte roty) {
if ( x < 0 ) x = 32; if ( x < 0 ) x = 32;
if ( y < 0 ) y = 32; if ( y < 0 ) y = 32;
@ -2919,26 +2986,26 @@ rot = new byte[2] { rotx, roty };*/
buffer[132] = mods; buffer[132] = mods;
SendRaw( 21, buffer ); SendRaw( 21, buffer );
} }
public void SendAddPlayerName( byte id, string name, string listname, string groupname, byte grouprank ) { public void SendExtAddPlayerName(short id, string name, Group grp, string displayname = "")
{
byte[] buffer = new byte[195]; byte[] buffer = new byte[195];
HTNO( (short)id ).CopyTo( buffer, 0 ); HTNO(id).CopyTo(buffer, 0);
StringFormat(name, 64).CopyTo(buffer, 2); StringFormat(name, 64).CopyTo(buffer, 2);
StringFormat( listname, 64 ).CopyTo( buffer, 66 ); if (displayname == "") { displayname = name; }
StringFormat( groupname, 64 ).CopyTo( buffer, 130 ); StringFormat(displayname, 64).CopyTo(buffer, 66);
buffer[194] = grouprank; StringFormat(grp.color + grp.name.ToUpper() + "s:", 64).CopyTo(buffer, 130);
buffer[194] = (byte)grp.Permission.GetHashCode();
SendRaw(22, buffer); SendRaw(22, buffer);
} }
public void SendAddEntity2( byte id, string name, string skinname, short x, short y, short z, byte yaw, byte pitch ) {
byte[] buffer = new byte[136]; public void SendExtAddEntity(byte id, string name, string displayname = "")
{
byte[] buffer = new byte[129];
buffer[0] = id; buffer[0] = id;
StringFormat(name, 64).CopyTo(buffer, 1); StringFormat(name, 64).CopyTo(buffer, 1);
StringFormat( skinname, 64 ).CopyTo( buffer, 65 ); if (displayname == "") { displayname = name; }
HTNO(x).CopyTo( buffer, 129 ); StringFormat(displayname, 64).CopyTo(buffer, 65);
HTNO (y).CopyTo (buffer, 131); SendRaw(23, buffer);
HTNO (z).CopyTo (buffer, 133);
buffer[134] = yaw;
buffer [135] = pitch;
SendRaw(33, buffer );
} }
public void SendDeletePlayerName( byte id ) { public void SendDeletePlayerName( byte id ) {
byte[] buffer = new byte[2]; byte[] buffer = new byte[2];

15
properties/Resources.Designer.cs generated
View File

@ -1,14 +1,14 @@
//------------------------------------------------------------------------------ //------------------------------------------------------------------------------
// <auto-generated> // <auto-generated>
// This code was generated by a tool. // This code was generated by a tool.
// Runtime Version:4.0.30319.17379 // Runtime Version:4.0.30319.34014
// //
// Changes to this file may cause incorrect behavior and will be lost if // Changes to this file may cause incorrect behavior and will be lost if
// the code is regenerated. // the code is regenerated.
// </auto-generated> // </auto-generated>
//------------------------------------------------------------------------------ //------------------------------------------------------------------------------
namespace MCGalaxy.Properties { namespace MCGalaxy.properties {
using System; using System;
@ -39,7 +39,7 @@ namespace MCGalaxy.Properties {
internal static global::System.Resources.ResourceManager ResourceManager { internal static global::System.Resources.ResourceManager ResourceManager {
get { get {
if (object.ReferenceEquals(resourceMan, null)) { if (object.ReferenceEquals(resourceMan, null)) {
global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("MCGalaxy.Properties.Resources", typeof(Resources).Assembly); global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("MCGalaxy.properties.Resources", typeof(Resources).Assembly);
resourceMan = temp; resourceMan = temp;
} }
return resourceMan; return resourceMan;
@ -59,12 +59,5 @@ namespace MCGalaxy.Properties {
resourceCulture = value; resourceCulture = value;
} }
} }
internal static byte[] Updater {
get {
object obj = ResourceManager.GetObject("Updater", resourceCulture);
return ((byte[])(obj));
}
}
} }
} }

3
properties/Resources.resx
View File

@ -118,7 +118,4 @@
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader> </resheader>
<assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" /> <assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
<data name="Updater" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\bin\Release\Updater.exe;System.Byte[], mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
</root> </root>