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

Fix bot models not having chat tokens.

Browse Source
This commit is contained in:
UnknownShadow200 2017-11-09 18:07:41 +11:00
parent eee5c60ab3
commit eb9b4bcef2
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
MCGalaxy/Entity/Entities.cs
View File

@ -126,7 +126,8 @@ namespace MCGalaxy {
internal static void Spawn(Player dst, PlayerBot b) { internal static void Spawn(Player dst, PlayerBot b) {
string name = Chat.Format(b.color + b.DisplayName, dst, true, false); string name = Chat.Format(b.color + b.DisplayName, dst, true, false);
if (b.DisplayName.CaselessEq("empty")) name = ""; if (b.DisplayName.CaselessEq("empty")) name = "";
string skin = Chat.Format(b.SkinName, dst, true, false), model = b.Model; string skin = Chat.Format(b.SkinName, dst, true, false);
string model = Chat.Format(b.Model, dst, true, false);
OnEntitySpawnedEvent.Call(b, ref name, ref skin, ref model, dst); OnEntitySpawnedEvent.Call(b, ref name, ref skin, ref model, dst);
SpawnRaw(dst, b.id, skin, name, model, b.Pos, b.Rot); SpawnRaw(dst, b.id, skin, name, model, b.Pos, b.Rot);
@ -195,9 +196,9 @@ namespace MCGalaxy {
byte id = (pl == entity) ? Entities.SelfID : entity.EntityID; byte id = (pl == entity) ? Entities.SelfID : entity.EntityID;
// Fallback block models for clients that don't support block definitions // Fallback block models for clients that don't support block definitions
string modelSend = model; string modelSend = Chat.Format(model, pl, true, false);
byte block; byte block;
if (byte.TryParse(model, out block) && !pl.hasBlockDefs) { if (byte.TryParse(modelSend, out block) && !pl.hasBlockDefs) {
modelSend = pl.level.RawFallback(block).ToString(); modelSend = pl.level.RawFallback(block).ToString();
} }