helpy4/Minecraft-Console-Client
1
0
Fork 0
mirror of https://github.com/MCCTeam/Minecraft-Console-Client synced 2025-10-14 21:22:49 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #94 from ZizzyDizzyMC/Indev

Browse source 
Mistake fixing +
This commit is contained in:
ORelio 2015-09-04 18:04:46 +00:00
commit fe68e881fb
3 changed files with 13 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
MinecraftClient/ChatBot.cs
View file

@ -266,7 +266,7 @@ namespace MinecraftClient
//<*Faction Someone> message //<*Faction Someone> message
//<*Faction Someone>: message //<*Faction Someone>: message
//<*Faction ~Nicknamed>: message //<*Faction ~Nicknamed>: message
if (text[0] == '<') if (text[0] == '<' && Settings.Vanilla_And_Factions_Messages_Enabled.Equals(true))
{ {
try try
{ {

3
MinecraftClient/Protocol/Handlers/Protocol18.cs
View file

@ -140,7 +140,10 @@ namespace MinecraftClient.Protocol.Handlers
SendPacket(0x00, packetData); SendPacket(0x00, packetData);
break; break;
case 0x01: //Join game case 0x01: //Join game
if (Settings.SendBrandInfoEnabled.Equals(true))
{
SendBrandInfo(); SendBrandInfo();
}
break; break;
case 0x02: //Chat message case 0x02: //Chat message
handler.OnTextReceived(ChatParser.ParseText(readNextString(ref packetData))); handler.OnTextReceived(ChatParser.ParseText(readNextString(ref packetData)));

7
MinecraftClient/Settings.cs
View file

@ -46,6 +46,7 @@ namespace MinecraftClient
public static bool playerHeadAsIcon = false; public static bool playerHeadAsIcon = false;
public static string chatbotLogFile = ""; public static string chatbotLogFile = "";
public static bool CacheScripts = true; public static bool CacheScripts = true;
public static bool SendBrandInfoEnabled = true;
//AntiAFK Settings //AntiAFK Settings
public static bool AntiAFK_Enabled = false; public static bool AntiAFK_Enabled = false;
@ -93,6 +94,7 @@ namespace MinecraftClient
//Chat Message Enabled / Disabled. //Chat Message Enabled / Disabled.
public static bool Hero_Chat_Messages_Enabled = true; public static bool Hero_Chat_Messages_Enabled = true;
public static bool Unknown_Chat_Plugin_Messages_One_Enabled = true; public static bool Unknown_Chat_Plugin_Messages_One_Enabled = true;
public static bool Vanilla_And_Factions_Messages_Enabled = true;
//Auto Respond //Auto Respond
public static bool AutoRespond_Enabled = false; public static bool AutoRespond_Enabled = false;
@ -138,6 +140,7 @@ namespace MinecraftClient
case "proxy": pMode = ParseMode.Proxy; break; case "proxy": pMode = ParseMode.Proxy; break;
case "appvars": pMode = ParseMode.AppVars; break; case "appvars": pMode = ParseMode.AppVars; break;
case "autorespond": pMode = ParseMode.AutoRespond; break; case "autorespond": pMode = ParseMode.AutoRespond; break;
case "chatbotmessages": pMode = ParseMode.ChatBotMessages; break;
default: pMode = ParseMode.Default; break; default: pMode = ParseMode.Default; break;
} }
} }
@ -165,6 +168,7 @@ namespace MinecraftClient
case "mcversion": ServerVersion = argValue; break; case "mcversion": ServerVersion = argValue; break;
case "splitmessagedelay": splitMessageDelay = TimeSpan.FromSeconds(str2int(argValue)); break; case "splitmessagedelay": splitMessageDelay = TimeSpan.FromSeconds(str2int(argValue)); break;
case "scriptcache": CacheScripts = str2bool(argValue); break; case "scriptcache": CacheScripts = str2bool(argValue); break;
case "sendbrandinfo": SendBrandInfoEnabled = str2bool(argValue); break;
case "botowners": case "botowners":
Bots_Owners.Clear(); Bots_Owners.Clear();
@ -295,6 +299,7 @@ namespace MinecraftClient
{ {
case "herochatmessagesenabled": Hero_Chat_Messages_Enabled = str2bool(argValue); break; case "herochatmessagesenabled": Hero_Chat_Messages_Enabled = str2bool(argValue); break;
case "unknownchatpluginmessagesone": Unknown_Chat_Plugin_Messages_One_Enabled = str2bool(argValue); break; case "unknownchatpluginmessagesone": Unknown_Chat_Plugin_Messages_One_Enabled = str2bool(argValue); break;
case "vanillaandfactionsmessages": Vanilla_And_Factions_Messages_Enabled = str2bool(argValue); break;
} }
break; break;
@ -384,6 +389,7 @@ namespace MinecraftClient
+ "exitonfailure=false\r\n" + "exitonfailure=false\r\n"
+ "scriptcache=true\r\n" + "scriptcache=true\r\n"
+ "timestamps=false\r\n" + "timestamps=false\r\n"
+ "sendbrandinfo=true\r\n"
+ "\r\n" + "\r\n"
+ "[AppVars]\r\n" + "[AppVars]\r\n"
+ "#yourvar=yourvalue\r\n" + "#yourvar=yourvalue\r\n"
@ -438,6 +444,7 @@ namespace MinecraftClient
+ "tpaccepteveryone=false\r\n" + "tpaccepteveryone=false\r\n"
+ "\r\n" + "\r\n"
+ "[ChatBotMessages]\r\n" + "[ChatBotMessages]\r\n"
+ "vanillaandfactionsmessages=true # Chat Formats \"<User> Message\" \"<*Faction User>: Message\" \r\n"
+ "herochatmessagesenabled=true # Chat Format is \"[Channel][Rank] User: Message\"\r\n" + "herochatmessagesenabled=true # Chat Format is \"[Channel][Rank] User: Message\"\r\n"
+ "unknownchatpluginmessagesone=true # Chat Format is \"**Faction<Rank> User : Message\"\r\n" + "unknownchatpluginmessagesone=true # Chat Format is \"**Faction<Rank> User : Message\"\r\n"
+ "\r\n" + "\r\n"