Skip to content

Indev #25

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ORelio merged 2 commits into from
Nov 6, 2013
Merged

Indev #25

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
07ac326
BouncyCastle reference is still there
featherbear Nov 4, 2013
6340fea
+ Made MCC commands ignore case.
featherbear Nov 4, 2013
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions MinecraftClient/.gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1,4 @@
/bin/
/obj/
MinecraftClient.sln
MinecraftClient.v11.suo
11 changes: 8 additions & 3 deletions MinecraftClient/McTcpClient.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -171,7 +171,7 @@ private void StartTalk()
}
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); }
if (text != "")
{
Expand Down Expand Up @@ -200,13 +200,18 @@ private void StartTalk()
}
}

if (text == "/quit")
if (text.ToLower() == "/quit")
{
ConsoleIO.WriteLine("You have left the server.");
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.");
handler.SendRespawnPacket();
Expand Down
4 changes: 0 additions & 4 deletions MinecraftClient/MinecraftClient.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,10 +60,6 @@
</PropertyGroup>
<PropertyGroup />
<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">
<SpecificVersion>False</SpecificVersion>
<HintPath>.\IKVM.OpenJDK.Core.dll</HintPath>
Expand Down