Implement EntityProperty extension.

UnknownShadow200 · UnknownShadow200 · commit e8118643252e · 2017-06-12T21:40:50.000+10:00
This allows changing entity rotation with /entityrot
diff --git a/ProCraft.sln b/ProCraft.sln
diff --git a/fCraft/Commands/ChatCommands.cs b/fCraft/Commands/ChatCommands.cs
@@ -253,7 +253,7 @@ public static void Player_IsBack(object sender, Events.PlayerMovedEventArgs e) {
                     e.Player.Message("You are no longer AFK");
                     e.Player.IsAFK = false;
                     e.Player.oldafkMob = e.Player.afkMob;
-                    e.Player.afkMob = e.Player.Info.Mob;
+                    e.Player.afkMob = e.Player.Info.Model;
                     Server.UpdateTabList(true);
                 }
                 e.Player.ResetIdleTimer();
@@ -283,7 +283,7 @@ private static void AFKHandler(Player player, CommandReader cmd) {
                 msg.Length > 0 ? " (" + (msg.Length > 32 ? msg.Remove(32) : msg) + ")" : "");
             player.IsAFK = !player.IsAFK;
             player.oldafkMob = player.afkMob;
-            player.afkMob = player.IsAFK ? player.AFKModel : player.Info.Mob;
+            player.afkMob = player.IsAFK ? player.AFKModel : player.Info.Model;
             Server.UpdateTabList(true);
             player.ResetIdleTimer();
         }
diff --git a/fCraft/Commands/CpeCommands.cs b/fCraft/Commands/CpeCommands.cs
diff --git a/fCraft/Commands/InfoCommands.cs b/fCraft/Commands/InfoCommands.cs
@@ -1761,7 +1761,7 @@ private static void ExtraInfoHandler(Player player, CommandReader cmd) {
             player.Message("Extra Info about: {0}", info.ClassyName);
             player.Message("  Times used &6Bot&S: {0}", info.TimesUsedBot);
             player.Message("  Promoted: {0} Demoted: {1}", info.PromoCount, info.DemoCount);
-            player.Message("  Reach Distance: {0} Model: {1}", info.ReachDistance, info.Mob);
+            player.Message("  Reach Distance: {0} Model: {1}", info.ReachDistance, info.Model);
             
             if (target != null && target.ClientName != null)
                 player.Message("  Client Name: &F{0}", target.ClientName);
diff --git a/fCraft/Commands/ModerationCommands.cs b/fCraft/Commands/ModerationCommands.cs
@@ -1209,7 +1209,7 @@ static void SetSpawnHandler( Player player, CommandReader cmd ) {
                     player.Message("Randomized Spawn!");
                 }
                 
-                player.Send(player.SpawnPacket(Packet.SelfId, player.Info.Rank.Color + player.Name, player.Info.Skin, player.Position));
+                Entities.Spawn( player, false, player, Packet.SelfId );
                 player.Message( "New spawn point saved." );
                 Logger.Log( LogType.UserActivity,
                             "{0} changed the spawned point.",
@@ -1222,7 +1222,8 @@ static void SetSpawnHandler( Player player, CommandReader cmd ) {
                     player.LastUsedPlayerName = target.Name;
                     
                     if( player.Can( Permission.Bring, target.Info.Rank ) ) {
-                        target.Send(target.SpawnPacket(Packet.SelfId, target.Info.Rank.Color + target.Name, target.Info.Skin, player.Position));
+                    	target.Position = player.Position;
+                        Entities.Spawn( target, false, target, Packet.SelfId );
                     } else {
                         player.Message( "You may only set spawn of players ranked {0}&S or lower.",
                                         player.Info.Rank.GetLimit( Permission.Bring ).ClassyName );
@@ -1231,7 +1232,6 @@ static void SetSpawnHandler( Player player, CommandReader cmd ) {
 
                 } else if( infos.Length > 0 ) {
                     player.MessageManyMatches( "player", infos );
-
                 } else {
                     infos = Server.FindPlayers(player, playerName, SearchOptions.IncludeSelf);
                     if( infos.Length > 0 ) {
diff --git a/fCraft/Commands/WorldCommands.cs b/fCraft/Commands/WorldCommands.cs
@@ -2694,7 +2694,7 @@ private static void WorldRenameHandler(Player player, CommandReader cmd) {
             player.LastUsedWorldName = newName;
             Logger.Log(LogType.UserActivity, "{0} renamed the world \"{1}\" to \"{2}\".", player.Name, oldName, newName);
             Server.Message("{0}&S renamed the world \"{1}\" to \"{2}\"", player.ClassyName, oldName, newName);
-            foreach(Entity bot in Entity.Entities.Where(e => oldName.CaselessEquals(e.World))) {
+            foreach(Entity bot in Entity.EntityList.Where(e => oldName.CaselessEquals(e.World))) {
                 Entity.UpdateEntityWorld(bot, newName);
             }
         }
diff --git a/fCraft/Network/Packet.CPE.cs b/fCraft/Network/Packet.CPE.cs
@@ -169,11 +169,11 @@ public static Packet MakeSetBlockPermission( Block block, bool canPlace, bool ca
         }
 
         [Pure]
-        public static Packet MakeChangeModel( byte entityId, [NotNull] string modelName, bool hasCP437) {
+        public static Packet MakeChangeModel( sbyte id, [NotNull] string modelName, bool hasCP437) {
             if( modelName == null ) throw new ArgumentNullException( "modelName" );
             //Logger.Log(LogType.Debug, "Send: MakeChangeModel({0}, {1})", entityId, modelName);
             Packet packet = new Packet( OpCode.ChangeModel );
-            packet.Bytes[1] = entityId;
+            packet.Bytes[1] = (byte)id;
             PacketWriter.WriteString( modelName, packet.Bytes, 2, hasCP437 );
             return packet;
         }
diff --git a/fCraft/Network/Player.Handshake.cs b/fCraft/Network/Player.Handshake.cs
@@ -363,6 +363,7 @@ bool NegotiateProtocolExtension() {
                     case ExtPlayerPositionsExtName:
                         if (version == 1) ext = CpeExt.ExtPlayerPositions;
                         supportsExtPositions = true;
+                        break;
                     case EntityPropertyExtName:
                         if (version == 1) ext = CpeExt.EntityProperty;
                         break;
diff --git a/fCraft/Network/Player.Networking.cs b/fCraft/Network/Player.Networking.cs
@@ -484,7 +484,7 @@ void ProcessSetBlockPacket() {
                 Message("&SYou are no longer AFK");
                 IsAFK = false;
                 oldafkMob = afkMob;
-                afkMob = Info.Mob;
+                afkMob = Info.Model;
                 Server.UpdateTabList(true);
             }
             ResetIdleTimer();
@@ -1182,11 +1182,7 @@ void SendJoinMessage(World oldWorld, World newWorld) {
         
         void SendJoinCpeExtensions() {
             SendEnvSettings();
-            SendNow(SpawnPacket(Packet.SelfId, Info.Rank.Color + Name, Info.Skin, Position));
-
-            if (Supports(CpeExt.ChangeModel)) {
-                SendNow(Packet.MakeChangeModel(255, !IsAFK ? Info.Mob : AFKModel, HasCP437));
-            }
+            Entities.Spawn(this, true, this, Packet.SelfId);
 
             if (Supports(CpeExt.HackControl)) {
                 SendNow(PlayerHacks.MakePacket(this, World.MOTD));
@@ -1215,17 +1211,14 @@ void SendJoinCpeExtensions() {
         
         internal void RemoveOldEntities(World world) {
             if (world == null) return;
-            foreach (Entity entity in Entity.Entities.Where(e => Entity.getWorld(e) == world)) {
+            foreach (Entity entity in Entity.EntityList.Where(e => Entity.getWorld(e) == world)) {
                 SendNow(Packet.MakeRemoveEntity(entity.ID));
             } 
         }
         
         internal void SendNewEntities(World world) {
-            foreach (Entity entity in Entity.Entities.Where(e => Entity.getWorld(e) == world)) {
-                SendNow(SpawnPacket(entity.ID, entity.Name, entity.Skin, Entity.getPos(entity)));
-                
-                if (!entity.Model.CaselessEquals("humanoid") && Supports(CpeExt.ChangeModel))
-                    SendNow(Packet.MakeChangeModel((byte)entity.ID, entity.Model, HasCP437));
+            foreach (Entity entity in Entity.EntityList.Where(e => Entity.getWorld(e) == world)) {
+                Entities.Spawn(this, true, entity);
             }
         }
         
@@ -1372,17 +1365,6 @@ public void Send(Packet packet) {
             if( canQueue ) priorityOutputQueue.Enqueue( packet );
         }
         
-        
-        /// <summary> Returns an appropriate spawn packet for this player. </summary>
-        public Packet SpawnPacket(sbyte id, string name, string skin, Position pos) {
-            name = Color.SubstituteSpecialColors(name, FallbackColors);            
-            if (Supports(CpeExt.ExtPlayerList2)) {
-                return Packet.MakeExtAddEntity2(id, name, skin, pos, HasCP437, supportsExtPositions);
-            } else {
-                return Packet.MakeAddEntity(id, name, pos, HasCP437, supportsExtPositions);
-            }
-        }
-        
         /// <summary> Returns an appropriate spawn packet for this player. </summary>
         public Packet TeleportPacket(sbyte id, Position pos) {
             if (id == Packet.SelfId) pos = pos.GetFixed();
@@ -1596,9 +1578,13 @@ void UpdateVisibleEntities() {
                     }
                 }
             }
+            
             oldskinName = Info.skinName;
-            oldMob = Info.Mob;
+            oldMob = Info.Model;
             oldafkMob = afkMob;
+            oldRotX = RotX;
+            oldRotZ = RotZ;
+            
             lock (entitiesLock)
                 RemoveNonRetainedEntities();
 
@@ -1669,32 +1655,28 @@ void FollowSpectatedEntity() {
             } else if( spectatePos != Position ) {
                 SendNow( TeleportPacket( Packet.SelfId, spectatePos ) );
             }
-            if (SpectatedPlayer.HeldBlock != HeldBlock && SpectatedPlayer.Supports(CpeExt.HeldBlock))
-            {
+            
+            if (SpectatedPlayer.HeldBlock != HeldBlock && SpectatedPlayer.Supports(CpeExt.HeldBlock)) {
                 byte block = (byte)SpectatedPlayer.HeldBlock;
                 CheckBlock(ref block);
                 SendNow(Packet.MakeHoldThis((Block)block, false));
             }
         }
         
-        void CheckOwnChange(sbyte id, Player otherPlayer) {
-            if (oldskinName != Info.skinName && otherPlayer.Supports(CpeExt.ExtPlayerList2)) {
-                otherPlayer.Send(otherPlayer.SpawnPacket(id, Info.Rank.Color + Name, Info.Skin, Position));
-                //otherPlayer.Send(Packet.MakeTeleport(id, Position));
-                if (otherPlayer.Supports(CpeExt.ChangeModel)) {
-                    string thisModel = IsAFK ? AFKModel : Info.Mob;
-                    if (otherPlayer.Info.Rank.CanSee(Info.Rank) && (thisModel.CaselessEquals("air") || thisModel.CaselessEquals("0"))) {
-                        thisModel = "Humanoid";
-                    }
-                    otherPlayer.Send(Packet.MakeChangeModel((byte)id, thisModel, otherPlayer.HasCP437));
-                }
+        void CheckOwnChange(sbyte id, Player other) {
+            bool needsUpdate = false;
+            if (oldskinName != Info.skinName && other.Supports(CpeExt.ExtPlayerList2)) needsUpdate = true;
+            if ((oldRotX != RotX || oldRotZ != RotZ) && other.Supports(CpeExt.EntityProperty)) needsUpdate = true;
+            
+            if (needsUpdate) {
+                Entities.Spawn(other, false, this, id);
+                // need to send teleport packet for correct position
+                other.Send(TeleportPacket(id, Position));
             }
-            if ((oldMob != Info.Mob || oldafkMob != afkMob) && otherPlayer.Supports(CpeExt.ChangeModel)) {
-                string thisModel = IsAFK ? AFKModel : Info.Mob;
-                if (otherPlayer.Info.Rank.CanSee(Info.Rank) && (thisModel.CaselessEquals("air") || thisModel.CaselessEquals("0"))) {
-                    thisModel = "Humanoid";
-                }
-                otherPlayer.Send(Packet.MakeChangeModel((byte)id, thisModel, otherPlayer.HasCP437));
+            
+            if ((oldMob != Info.Model || oldafkMob != afkMob) && other.Supports(CpeExt.ChangeModel)) {
+                string model = Entities.ModelFor(other, this);
+                other.Send(Packet.MakeChangeModel(id, model, other.HasCP437));
             }
         }
         
@@ -1712,16 +1694,8 @@ VisibleEntity AddEntity( [NotNull] Player player ) {
                     pos = player.WorldMap.Spawn;
                 }
                 
-                Send(SpawnPacket(newEntity.Id, player.Info.Rank.Color + player.Name, player.Info.Skin, pos));
+                Entities.Spawn( this, false, player, newEntity.Id );
                 Send(TeleportPacket(newEntity.Id, player.Position));
-                
-                if (Supports(CpeExt.ChangeModel)) {
-                    string addedModel = player.IsAFK ? player.AFKModel : player.Info.Mob;
-                    if (Info.Rank.CanSee(player.Info.Rank) && (addedModel.CaselessEquals("air") || addedModel.CaselessEquals("0"))) {
-                        addedModel = "Humanoid";
-                    }
-                    Send(Packet.MakeChangeModel((byte)newEntity.Id, addedModel, HasCP437));
-                }
                 return newEntity;
             } else {
                 throw new InvalidOperationException("Player.AddEntity: Ran out of entity IDs.");
@@ -1757,16 +1731,9 @@ void ReAddEntity( [NotNull] VisibleEntity entity, [NotNull] Player player ) {
             Logger.Log( LogType.Debug, "ReAddEntity: {0} re-added {1} ({2})", Name, entity.Id, player.Name );
 #endif
             SendNow( Packet.MakeRemoveEntity( entity.Id ) );
-            SendNow(SpawnPacket(entity.Id, player.Info.Rank.Color + player.Name, player.Info.Skin, player.WorldMap.Spawn));
-            SendNow(TeleportPacket(entity.Id, player.Position));
-
-            if (Supports(CpeExt.ChangeModel)) {
-                string readdedModel = player.IsAFK ? player.AFKModel : player.Info.Mob;
-                if (Info.Rank.CanSee(player.Info.Rank) && (readdedModel.CaselessEquals("air") || readdedModel.CaselessEquals("0"))) {
-                    readdedModel = "Humanoid";
-                }
-                SendNow(Packet.MakeChangeModel((byte)entity.Id, readdedModel, HasCP437));
-            }
+            Entities.Spawn( this, true, player, entity.Id );
+            // need to send teleport packet for correct position
+            SendNow( TeleportPacket( entity.Id, player.Position ) );
         }
 
 
diff --git a/fCraft/Player/Player.cs b/fCraft/Player/Player.cs
@@ -51,6 +51,7 @@ public sealed partial class Player : IClassy {
         public bool IsSuper;
 
         public bool usedquit = false;
+        public int RotX, RotZ, oldRotX, oldRotZ;
 
         public string quitmessage = "/Quit";
 
@@ -344,7 +345,7 @@ public void ParseMessage( [NotNull] string rawMessage, bool fromConsole ) {
                 Message("&SYou are no longer AFK");
                 IsAFK = false;
                 oldafkMob = afkMob;
-                afkMob = Info.Mob;
+                afkMob = Info.Model;
                 Server.UpdateTabList(true);
             }
 
diff --git a/fCraft/Player/PlayerInfo.cs b/fCraft/Player/PlayerInfo.cs
@@ -425,7 +425,7 @@ public bool AllowThirdPerson {
         /// Use Player.CanSee() method to check visibility to specific observers. </summary>
         public bool IsHidden;
 
-        public string Mob = "Humanoid";
+        public string Model = "Humanoid";
         public string skinName = "";
         
         public string Skin { get { return skinName == "" ? Name : skinName; } }
@@ -714,7 +714,7 @@ internal static PlayerInfo LoadFormat2( string[] fields, int count ) {
                 Int32.TryParse(fields[59], out info.DemoCount);
             }
 
-            if (count > 60) info.Mob = fields[60];
+            if (count > 60) info.Model = fields[60];
 
             if (count > 61)
             {
@@ -1229,7 +1229,7 @@ internal void Serialize( StringBuffer sb ) {
             sb.Append(DemoCount); // 59
             sb.Append(',');
 
-            sb.Append(Mob); // 60
+            sb.Append(Model); // 60
             sb.Append(',');
 
             sb.Append(ReachDistance); // 61
@@ -1324,8 +1324,8 @@ public void ProcessLogin( [NotNull] Player player ) {
             IsOnline = true;
             PlayerObject = player;
             LastModified = DateTime.UtcNow;
-            if (Mob == null)
-                Mob = "humanoid";
+            if (Model == null)
+                Model = "humanoid";
         }
 
 
diff --git a/fCraft/System/Server.cs b/fCraft/System/Server.cs
@@ -796,7 +796,7 @@ private static void CheckIdles(SchedulerTask task) {
                     player.Info.TotalTime = player.Info.TotalTime - player.IdleTime;
                     player.IsAFK = false;
                     player.oldafkMob = player.afkMob;
-                    player.afkMob = player.Info.Mob;
+                    player.afkMob = player.Info.Model;
                     player.ResetIdleTimer(); // to prevent kick from firing more than once
                 }
             }
diff --git a/fCraft/World/Entities.cs b/fCraft/World/Entities.cs
@@ -0,0 +1,62 @@
+﻿// ProCraft Copyright 2014-2016 Joseph Beauvais <123DMWM@gmail.com>
+using System;
+using System.IO;
+using System.Collections.Generic;
+
+namespace fCraft {
+
+    /// <summary> Helper methods for spawning and despawning entities. </summary>
+    public static class Entities {
+        
+        public static string ModelFor(Player dst, Player entity) {
+            string model = entity.IsAFK ? entity.AFKModel : entity.Info.Model;           
+            if (dst.Info.Rank.CanSee(entity.Info.Rank) && (model.CaselessEquals("air") || model.CaselessEquals("0"))) {
+                model = "humanoid";
+            }
+            return model;
+        }
+
+        public static void Spawn(Player dst, bool sendNow, Player entity, sbyte id) {
+            string name = entity.Info.Rank.Color + entity.Name;
+            string skin = entity.Info.Skin, model = ModelFor(dst, entity);        
+            Spawn(dst, sendNow, id, name, skin, model, 
+                  entity.Position, entity.RotX, entity.RotZ);
+        }
+        
+        public static void Spawn(Player dst, bool sendNow, Entity entity) {
+            Spawn(dst, sendNow, entity.ID, entity.Name, entity.Skin,
+                  entity.Model, Entity.getPos(entity), 0, 0);
+        }
+        
+        public static void Spawn(Player dst, bool sendNow, sbyte id, string name,
+                                 string skin, string model, Position pos, int rotX, int rotZ) {
+            Send(dst, sendNow, SpawnPacket(dst, id, name, skin, pos));
+            if (dst.Supports(CpeExt.ChangeModel)) {
+                Send(dst, sendNow, Packet.MakeChangeModel(id, model, dst.HasCP437));
+            }
+            
+            if (dst.Supports(CpeExt.EntityProperty)) {
+                Send(dst, sendNow, Packet.MakeEntityProperty(id, EntityProp.RotationX, rotX));
+                Send(dst, sendNow, Packet.MakeEntityProperty(id, EntityProp.RotationZ, rotZ));
+            }
+        }
+        
+
+        static Packet SpawnPacket(Player dst, sbyte id, string name, string skin, Position pos) {
+            name = Color.SubstituteSpecialColors(name, dst.FallbackColors);            
+            if (dst.Supports(CpeExt.ExtPlayerList2)) {
+                return Packet.MakeExtAddEntity2(id, name, skin, pos, dst.HasCP437, dst.supportsExtPositions);
+            } else {
+                return Packet.MakeAddEntity(id, name, pos, dst.HasCP437, dst.supportsExtPositions);
+            }
+        }
+        
+        static void Send(Player dst, bool sendNow, Packet p) {
+            if (sendNow) {
+                dst.SendNow(p);
+            } else {
+                dst.Send(p);
+            }
+        }
+    }
+}
diff --git a/fCraft/World/Entity.cs b/fCraft/World/Entity.cs
diff --git a/fCraft/fCraft.csproj b/fCraft/fCraft.csproj

Original file line number	Diff line number	Diff line change
`@@ -2694,7 +2694,7 @@ private static void WorldRenameHandler(Player player, CommandReader cmd) {`
`2694`	`2694`	`player.LastUsedWorldName = newName;`
`2695`	`2695`	`Logger.Log(LogType.UserActivity, "{0} renamed the world \"{1}\" to \"{2}\".", player.Name, oldName, newName);`
`2696`	`2696`	`Server.Message("{0}&S renamed the world \"{1}\" to \"{2}\"", player.ClassyName, oldName, newName);`
`2697`		`- foreach(Entity bot in Entity.Entities.Where(e => oldName.CaselessEquals(e.World))) {`
	`2697`	`+ foreach(Entity bot in Entity.EntityList.Where(e => oldName.CaselessEquals(e.World))) {`
`2698`	`2698`	`Entity.UpdateEntityWorld(bot, newName);`
`2699`	`2699`	`}`
`2700`	`2700`	`}`
Original file line number	Diff line number	Diff line change
`@@ -169,11 +169,11 @@ public static Packet MakeSetBlockPermission( Block block, bool canPlace, bool ca`
`169`	`169`	`}`
`170`	`170`
`171`	`171`	`[Pure]`
`172`		`- public static Packet MakeChangeModel( byte entityId, [NotNull] string modelName, bool hasCP437) {`
	`172`	`+ public static Packet MakeChangeModel( sbyte id, [NotNull] string modelName, bool hasCP437) {`
`173`	`173`	`if( modelName == null ) throw new ArgumentNullException( "modelName" );`
`174`	`174`	`//Logger.Log(LogType.Debug, "Send: MakeChangeModel({0}, {1})", entityId, modelName);`
`175`	`175`	`Packet packet = new Packet( OpCode.ChangeModel );`
`176`		`- packet.Bytes[1] = entityId;`
	`176`	`+ packet.Bytes[1] = (byte)id;`
`177`	`177`	`PacketWriter.WriteString( modelName, packet.Bytes, 2, hasCP437 );`
`178`	`178`	`return packet;`
`179`	`179`	`}`