Merge pull request #25 from bearbear12345/Indev

Indev
This commit is contained in:
ORelio 2013-11-06 04:30:30 -08:00
commit ccc2fd57b4
3 changed files with 10 additions and 7 deletions

View file

@ -1,2 +1,4 @@
/bin/ /bin/
/obj/ /obj/
MinecraftClient.sln
MinecraftClient.v11.suo

View file

@ -171,7 +171,7 @@ namespace MinecraftClient
} }
else else
{ {
if (text == "/quit" || text == "/reco" || text == "/reconnect") { break; } if (text.ToLower() == "/quit" || text.ToLower().StartsWith("/exec ") || text.ToLower() == "/reco" || text.ToLower() == "/reconnect") { break; }
while (text.Length > 0 && text[0] == ' ') { text = text.Substring(1); } while (text.Length > 0 && text[0] == ' ') { text = text.Substring(1); }
if (text != "") if (text != "")
{ {
@ -200,13 +200,18 @@ namespace MinecraftClient
} }
} }
if (text == "/quit") if (text.ToLower() == "/quit")
{ {
ConsoleIO.WriteLine("You have left the server."); ConsoleIO.WriteLine("You have left the server.");
Disconnect(); Disconnect();
} }
else if (text == "/reco" || text == "/reconnect") else if (text.ToLower().StartsWith("/exec ")) {
handler.BotLoad(new Bots.Scripting("config/" + text.Split()[1]));
}
else if (text.ToLower() == "/reco" || text.ToLower() == "/reconnect")
{ {
ConsoleIO.WriteLine("You have left the server."); ConsoleIO.WriteLine("You have left the server.");
handler.SendRespawnPacket(); handler.SendRespawnPacket();

View file

@ -60,10 +60,6 @@
</PropertyGroup> </PropertyGroup>
<PropertyGroup /> <PropertyGroup />
<ItemGroup> <ItemGroup>
<Reference Include="BouncyCastle.Crypto, Version=1.7.4114.6375, Culture=neutral, PublicKeyToken=0e99375e54769942">
<SpecificVersion>False</SpecificVersion>
<HintPath>.\BouncyCastle.Crypto.dll</HintPath>
</Reference>
<Reference Include="IKVM.OpenJDK.Core, Version=7.0.4335.0, Culture=neutral, PublicKeyToken=13235d27fcbfff58, processorArchitecture=MSIL"> <Reference Include="IKVM.OpenJDK.Core, Version=7.0.4335.0, Culture=neutral, PublicKeyToken=13235d27fcbfff58, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion> <SpecificVersion>False</SpecificVersion>
<HintPath>.\IKVM.OpenJDK.Core.dll</HintPath> <HintPath>.\IKVM.OpenJDK.Core.dll</HintPath>