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

Discord emotes in custom chat tokens now

Browse Source
This commit is contained in:
UnknownShadow200 2017-10-15 20:16:11 +11:00
parent 3457a6e5fa
commit dc4cd0f4ee
2 changed files with 15 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
MCGalaxy/Chat/ChatTokens.cs
View File

@ -126,11 +126,20 @@ namespace MCGalaxy {
char[] colon = new char[] {':'};
foreach (string line in lines) {
if (line.StartsWith("//")) continue;
string[] parts = line.Split(colon, 2);
if (parts.Length == 1) continue; // not a proper line
if (line.StartsWith("//") || line.Length == 0) continue;
// Need to handle special case of :discord: emotes
int offset = 0;
if (line[0] == ':') {
int emoteEnd = line.IndexOf(':', 1);
if (emoteEnd == -1) continue;
offset = emoteEnd + 1;
}
string key = parts[0].Trim(), value = parts[1].Trim();
int separator = line.IndexOf(':', offset);
if (separator == -1) continue; // not a proper line
string key = line.Substring(0, separator).Trim();
string value = line.Substring(separator + 1).Trim();
if (key.Length == 0) continue;
Custom.Add(new ChatToken(key, value, null));
}

4
MCGalaxy/Commands/World/CmdBlockProperties.cs
View File

@ -270,8 +270,8 @@ namespace MCGalaxy.Commands.World {
Player.Message(p, "%HSets various properties for blocks.");
Player.Message(p, "%H[scope] can be: %Score, global, level");
Player.Message(p, "%Hproperties: %Sportal, messageblock, rails, waterkills, " +
"lavakills, door, tdoor, killer, deathmessage, animalai, stackblock, opblock, odoor, drownable");
Player.Message(p, "%Hproperties: %Sportal, messageblock, rails, waterkills, lavakills, door, tdoor, " +
"killer, deathmessage, animalai, stackblock, opblock, odoor, drownable, grass, block");
Player.Message(p, "%HType %T/Help BlockProps [property] %Hfor more details");
}