Updated for Rocket 3.2.0.2

Zamirathe · Zamirathe · commit 9639e3b122aa · 2015-04-06T12:38:06.000-06:00
diff --git a/Zamirathe_HomeCommand/CommandHome.cs b/Zamirathe_HomeCommand/CommandHome.cs
@@ -29,14 +29,13 @@ public string Help
                 return "Teleports you to your bed if you have one.";
             }
         }
-        public void Execute(CSteamID playerid, string bed)
+        public void Execute(RocketPlayer playerid, string bed)
         {
-            Player player = PlayerTool.getPlayer(playerid);
-            HomePlayer homeplayer = player.transform.GetComponent<HomePlayer>();
-            object[] cont = HomeCommand.CheckConfig(player, playerid, homeplayer);
+            HomePlayer homeplayer = playerid.Player.transform.GetComponent<HomePlayer>();
+            object[] cont = HomeCommand.CheckConfig(playerid);
             if (!(bool)cont[0]) return;
             // A bed was found, so let's run a few checks.
-            homeplayer.GoHome((Vector3)cont[1], (byte)cont[2], player);
+            homeplayer.GoHome((Vector3)cont[1], (byte)cont[2], playerid);
         }
     }
 }
diff --git a/Zamirathe_HomeCommand/HomeCommand.cs b/Zamirathe_HomeCommand/HomeCommand.cs
@@ -26,30 +26,30 @@ protected override void Load()
             }
         }
         // All we are doing here is checking the config to see if anything like restricted movement or time restriction is enforced.
-        public static object[] CheckConfig(Player player, CSteamID playerid, HomePlayer homeplayer)
+        public static object[] CheckConfig(RocketPlayer player)
         {
             object[] returnv = { false, null, null };
             // First check if command is enabled.
             if (!HomeCommand.Instance.Configuration.Enabled)
             {
                 // Command disabled.
-                RocketChatManager.Say(playerid, String.Format(HomeCommand.Instance.Configuration.DisabledMsg, player.SteamChannel.SteamPlayer.SteamPlayerID.CharacterName));
+                RocketChatManager.Say(player, String.Format(HomeCommand.Instance.Configuration.DisabledMsg, player.CharacterName));
                 return returnv;
             }
             // It is enabled, but are they in a vehicle?
-            if (player.Stance.Stance == EPlayerStance.DRIVING || player.Stance.Stance == EPlayerStance.SITTING)
+            if (player.Stance == EPlayerStance.DRIVING || player.Stance == EPlayerStance.SITTING)
             {
                 // They are in a vehicle.
-                RocketChatManager.Say(playerid, String.Format(HomeCommand.Instance.Configuration.NoVehicleMsg, player.SteamChannel.SteamPlayer.SteamPlayerID.CharacterName));
+                RocketChatManager.Say(player, String.Format(HomeCommand.Instance.Configuration.NoVehicleMsg, player.CharacterName));
                 return returnv;
             }
             // They aren't in a vehicle, so check if they have a bed.    
             Vector3 bedPos;
             byte bedRot;
-            if (!BarricadeManager.tryGetBed(playerid, out bedPos, out bedRot))
+            if (!BarricadeManager.tryGetBed(player.CSteamID, out bedPos, out bedRot))
             {
                 // Bed not found.
-                RocketChatManager.Say(playerid, String.Format(HomeCommand.Instance.Configuration.NoBedMsg, player.SteamChannel.SteamPlayer.SteamPlayerID.CharacterName));
+                RocketChatManager.Say(player, String.Format(HomeCommand.Instance.Configuration.NoBedMsg, player.CharacterName));
                 return returnv;
             }
             object[] returnv2 = { true, bedPos, bedRot };
diff --git a/Zamirathe_HomeCommand/HomePlayer.cs b/Zamirathe_HomeCommand/HomePlayer.cs
@@ -20,14 +20,14 @@ public class HomePlayer : RocketPlayerComponent
         private bool cangohome;
         private Vector3 bedPos;
         private byte bedRot;
-        private Player p;
+        private RocketPlayer p;
 
         private void Load()
         {
             this.GoingHome = false;
             this.cangohome = false;
         }
-        public void GoHome(Vector3 bedPos, byte bedRot, Player player)
+        public void GoHome(Vector3 bedPos, byte bedRot, RocketPlayer player)
         {
             this.waitrestricted = HomeCommand.Instance.Configuration.TeleportWait;
             this.movementrestricted = HomeCommand.Instance.Configuration.MovementRestriction;
@@ -45,14 +45,14 @@ public void GoHome(Vector3 bedPos, byte bedRot, Player player)
                 }
                 else
                 {
-                    if (player.SteamChannel.SteamPlayer.IsAdmin && HomeCommand.Instance.WaitGroups.ContainsKey("admin"))
+                    if (player.IsAdmin && HomeCommand.Instance.WaitGroups.ContainsKey("admin"))
                     {
                         HomeCommand.Instance.WaitGroups.TryGetValue("admin", out this.waittime);
                     }
                     else
                     {
                         // Either not an admin or they don't get special wait restrictions.
-                        List<Group> hg = player.GetGroups();
+                        List<Group> hg = player.Groups;
                         byte[] time2 = new byte[hg.Count];
                         for (byte g=0;g<hg.Count;g++)
                         {
@@ -71,11 +71,11 @@ public void GoHome(Vector3 bedPos, byte bedRot, Player player)
                 if (this.movementrestricted)
                 {
                     this.LastCalledHomePos = this.transform.position;
-                    RocketChatManager.Say(player.SteamChannel.SteamPlayer.SteamPlayerID.CSteamID, String.Format(HomeCommand.Instance.Configuration.FoundBedWaitNoMoveMsg, player.name, this.waittime));
+                    RocketChatManager.Say(player, String.Format(HomeCommand.Instance.Configuration.FoundBedWaitNoMoveMsg, player.CharacterName, this.waittime));
                 }
                 else
                 {
-                    RocketChatManager.Say(player.SteamChannel.SteamPlayer.SteamPlayerID.CSteamID, String.Format(HomeCommand.Instance.Configuration.FoundBedNowWaitMsg, player.name, this.waittime));
+                    RocketChatManager.Say(player, String.Format(HomeCommand.Instance.Configuration.FoundBedNowWaitMsg, player.CharacterName, this.waittime));
                 }
             }
             else
@@ -88,28 +88,28 @@ public void GoHome(Vector3 bedPos, byte bedRot, Player player)
         private void DoGoHome()
         {
             if (!this.cangohome) return;
-            RocketChatManager.Say(this.p.SteamChannel.SteamPlayer.SteamPlayerID.CSteamID, String.Format(HomeCommand.Instance.Configuration.TeleportMsg, this.p.SteamChannel.SteamPlayer.SteamPlayerID.CharacterName));
-            this.p.sendTeleport(this.bedPos, this.bedRot);
+            RocketChatManager.Say(this.p, String.Format(HomeCommand.Instance.Configuration.TeleportMsg, this.p.CharacterName));
+            this.p.Teleport(this.bedPos, this.bedRot);
             this.cangohome = false;
             this.GoingHome = false;
         }
         public void FixedUpdate()
         {
             if (!this.GoingHome) return;
-            if (this.p.PlayerLife.Dead)
+            if (this.p.Dead)
             {
                 // Abort teleport, they died.
-                RocketChatManager.Say(this.p.SteamChannel.SteamPlayer.SteamPlayerID.CSteamID, String.Format(HomeCommand.Instance.Configuration.NoTeleportDiedMsg, this.p.SteamChannel.SteamPlayer.SteamPlayerID.CharacterName));
+                RocketChatManager.Say(this.p, String.Format(HomeCommand.Instance.Configuration.NoTeleportDiedMsg, this.p.CharacterName));
                 this.GoingHome = false;
                 this.cangohome = false;
                 return;
             }
             if (this.movementrestricted)
             {
-                if (Vector3.Distance(this.p.transform.position, this.LastCalledHomePos) > 0.1)
+                if (Vector3.Distance(this.p.Position, this.LastCalledHomePos) > 0.1)
                 {
                     // Abort teleport, they moved.
-                    RocketChatManager.Say(this.p.SteamChannel.SteamPlayer.SteamPlayerID.CSteamID, String.Format(HomeCommand.Instance.Configuration.UnableMoveSinceMoveMsg, this.p.SteamChannel.SteamPlayer.SteamPlayerID.CharacterName));
+                    RocketChatManager.Say(this.p, String.Format(HomeCommand.Instance.Configuration.UnableMoveSinceMoveMsg, this.p.CharacterName));
                     this.GoingHome = false;
                     this.cangohome = false;
                     return;
diff --git a/Zamirathe_HomeCommand/Properties/AssemblyInfo.cs b/Zamirathe_HomeCommand/Properties/AssemblyInfo.cs
@@ -32,5 +32,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("2.1.0.0")]
-[assembly: AssemblyFileVersion("2.1.0.0")]
+[assembly: AssemblyVersion("2.1.0.1")]
+[assembly: AssemblyFileVersion("2.1.0.1")]

Original file line number	Diff line number	Diff line change
`@@ -29,14 +29,13 @@ public string Help`
`29`	`29`	`return "Teleports you to your bed if you have one.";`
`30`	`30`	`}`
`31`	`31`	`}`
`32`		`- public void Execute(CSteamID playerid, string bed)`
	`32`	`+ public void Execute(RocketPlayer playerid, string bed)`
`33`	`33`	`{`
`34`		`- Player player = PlayerTool.getPlayer(playerid);`
`35`		`- HomePlayer homeplayer = player.transform.GetComponent<HomePlayer>();`
`36`		`- object[] cont = HomeCommand.CheckConfig(player, playerid, homeplayer);`
	`34`	`+ HomePlayer homeplayer = playerid.Player.transform.GetComponent<HomePlayer>();`
	`35`	`+ object[] cont = HomeCommand.CheckConfig(playerid);`
`37`	`36`	`if (!(bool)cont[0]) return;`
`38`	`37`	`// A bed was found, so let's run a few checks.`
`39`		`- homeplayer.GoHome((Vector3)cont[1], (byte)cont[2], player);`
	`38`	`+ homeplayer.GoHome((Vector3)cont[1], (byte)cont[2], playerid);`
`40`	`39`	`}`
`41`	`40`	`}`
`42`	`41`	`}`
Original file line number	Diff line number	Diff line change
`@@ -26,30 +26,30 @@ protected override void Load()`
`26`	`26`	`}`
`27`	`27`	`}`
`28`	`28`	`// All we are doing here is checking the config to see if anything like restricted movement or time restriction is enforced.`
`29`		`- public static object[] CheckConfig(Player player, CSteamID playerid, HomePlayer homeplayer)`
	`29`	`+ public static object[] CheckConfig(RocketPlayer player)`
`30`	`30`	`{`
`31`	`31`	`object[] returnv = { false, null, null };`
`32`	`32`	`// First check if command is enabled.`
`33`	`33`	`if (!HomeCommand.Instance.Configuration.Enabled)`
`34`	`34`	`{`
`35`	`35`	`// Command disabled.`
`36`		`- RocketChatManager.Say(playerid, String.Format(HomeCommand.Instance.Configuration.DisabledMsg, player.SteamChannel.SteamPlayer.SteamPlayerID.CharacterName));`
	`36`	`+ RocketChatManager.Say(player, String.Format(HomeCommand.Instance.Configuration.DisabledMsg, player.CharacterName));`
`37`	`37`	`return returnv;`
`38`	`38`	`}`
`39`	`39`	`// It is enabled, but are they in a vehicle?`
`40`		`- if (player.Stance.Stance == EPlayerStance.DRIVING \|\| player.Stance.Stance == EPlayerStance.SITTING)`
	`40`	`+ if (player.Stance == EPlayerStance.DRIVING \|\| player.Stance == EPlayerStance.SITTING)`
`41`	`41`	`{`
`42`	`42`	`// They are in a vehicle.`
`43`		`- RocketChatManager.Say(playerid, String.Format(HomeCommand.Instance.Configuration.NoVehicleMsg, player.SteamChannel.SteamPlayer.SteamPlayerID.CharacterName));`
	`43`	`+ RocketChatManager.Say(player, String.Format(HomeCommand.Instance.Configuration.NoVehicleMsg, player.CharacterName));`
`44`	`44`	`return returnv;`
`45`	`45`	`}`
`46`	`46`	`// They aren't in a vehicle, so check if they have a bed.`
`47`	`47`	`Vector3 bedPos;`
`48`	`48`	`byte bedRot;`
`49`		`- if (!BarricadeManager.tryGetBed(playerid, out bedPos, out bedRot))`
	`49`	`+ if (!BarricadeManager.tryGetBed(player.CSteamID, out bedPos, out bedRot))`
`50`	`50`	`{`
`51`	`51`	`// Bed not found.`
`52`		`- RocketChatManager.Say(playerid, String.Format(HomeCommand.Instance.Configuration.NoBedMsg, player.SteamChannel.SteamPlayer.SteamPlayerID.CharacterName));`
	`52`	`+ RocketChatManager.Say(player, String.Format(HomeCommand.Instance.Configuration.NoBedMsg, player.CharacterName));`
`53`	`53`	`return returnv;`
`54`	`54`	`}`
`55`	`55`	`object[] returnv2 = { true, bedPos, bedRot };`
Original file line number	Diff line number	Diff line change
`@@ -20,14 +20,14 @@ public class HomePlayer : RocketPlayerComponent`
`20`	`20`	`private bool cangohome;`
`21`	`21`	`private Vector3 bedPos;`
`22`	`22`	`private byte bedRot;`
`23`		`- private Player p;`
	`23`	`+ private RocketPlayer p;`
`24`	`24`
`25`	`25`	`private void Load()`
`26`	`26`	`{`
`27`	`27`	`this.GoingHome = false;`
`28`	`28`	`this.cangohome = false;`
`29`	`29`	`}`
`30`		`- public void GoHome(Vector3 bedPos, byte bedRot, Player player)`
	`30`	`+ public void GoHome(Vector3 bedPos, byte bedRot, RocketPlayer player)`
`31`	`31`	`{`
`32`	`32`	`this.waitrestricted = HomeCommand.Instance.Configuration.TeleportWait;`
`33`	`33`	`this.movementrestricted = HomeCommand.Instance.Configuration.MovementRestriction;`
`@@ -45,14 +45,14 @@ public void GoHome(Vector3 bedPos, byte bedRot, Player player)`
`45`	`45`	`}`
`46`	`46`	`else`
`47`	`47`	`{`
`48`		`- if (player.SteamChannel.SteamPlayer.IsAdmin && HomeCommand.Instance.WaitGroups.ContainsKey("admin"))`
	`48`	`+ if (player.IsAdmin && HomeCommand.Instance.WaitGroups.ContainsKey("admin"))`
`49`	`49`	`{`
`50`	`50`	`HomeCommand.Instance.WaitGroups.TryGetValue("admin", out this.waittime);`
`51`	`51`	`}`
`52`	`52`	`else`
`53`	`53`	`{`
`54`	`54`	`// Either not an admin or they don't get special wait restrictions.`
`55`		`- List<Group> hg = player.GetGroups();`
	`55`	`+ List<Group> hg = player.Groups;`
`56`	`56`	`byte[] time2 = new byte[hg.Count];`
`57`	`57`	`for (byte g=0;g<hg.Count;g++)`
`58`	`58`	`{`
`@@ -71,11 +71,11 @@ public void GoHome(Vector3 bedPos, byte bedRot, Player player)`
`71`	`71`	`if (this.movementrestricted)`
`72`	`72`	`{`
`73`	`73`	`this.LastCalledHomePos = this.transform.position;`
`74`		`- RocketChatManager.Say(player.SteamChannel.SteamPlayer.SteamPlayerID.CSteamID, String.Format(HomeCommand.Instance.Configuration.FoundBedWaitNoMoveMsg, player.name, this.waittime));`
	`74`	`+ RocketChatManager.Say(player, String.Format(HomeCommand.Instance.Configuration.FoundBedWaitNoMoveMsg, player.CharacterName, this.waittime));`
`75`	`75`	`}`
`76`	`76`	`else`
`77`	`77`	`{`
`78`		`- RocketChatManager.Say(player.SteamChannel.SteamPlayer.SteamPlayerID.CSteamID, String.Format(HomeCommand.Instance.Configuration.FoundBedNowWaitMsg, player.name, this.waittime));`
	`78`	`+ RocketChatManager.Say(player, String.Format(HomeCommand.Instance.Configuration.FoundBedNowWaitMsg, player.CharacterName, this.waittime));`
`79`	`79`	`}`
`80`	`80`	`}`
`81`	`81`	`else`
`@@ -88,28 +88,28 @@ public void GoHome(Vector3 bedPos, byte bedRot, Player player)`
`88`	`88`	`private void DoGoHome()`
`89`	`89`	`{`
`90`	`90`	`if (!this.cangohome) return;`
`91`		`- RocketChatManager.Say(this.p.SteamChannel.SteamPlayer.SteamPlayerID.CSteamID, String.Format(HomeCommand.Instance.Configuration.TeleportMsg, this.p.SteamChannel.SteamPlayer.SteamPlayerID.CharacterName));`
`92`		`- this.p.sendTeleport(this.bedPos, this.bedRot);`
	`91`	`+ RocketChatManager.Say(this.p, String.Format(HomeCommand.Instance.Configuration.TeleportMsg, this.p.CharacterName));`
	`92`	`+ this.p.Teleport(this.bedPos, this.bedRot);`
`93`	`93`	`this.cangohome = false;`
`94`	`94`	`this.GoingHome = false;`
`95`	`95`	`}`
`96`	`96`	`public void FixedUpdate()`
`97`	`97`	`{`
`98`	`98`	`if (!this.GoingHome) return;`
`99`		`- if (this.p.PlayerLife.Dead)`
	`99`	`+ if (this.p.Dead)`
`100`	`100`	`{`
`101`	`101`	`// Abort teleport, they died.`
`102`		`- RocketChatManager.Say(this.p.SteamChannel.SteamPlayer.SteamPlayerID.CSteamID, String.Format(HomeCommand.Instance.Configuration.NoTeleportDiedMsg, this.p.SteamChannel.SteamPlayer.SteamPlayerID.CharacterName));`
	`102`	`+ RocketChatManager.Say(this.p, String.Format(HomeCommand.Instance.Configuration.NoTeleportDiedMsg, this.p.CharacterName));`
`103`	`103`	`this.GoingHome = false;`
`104`	`104`	`this.cangohome = false;`
`105`	`105`	`return;`
`106`	`106`	`}`
`107`	`107`	`if (this.movementrestricted)`
`108`	`108`	`{`
`109`		`- if (Vector3.Distance(this.p.transform.position, this.LastCalledHomePos) > 0.1)`
	`109`	`+ if (Vector3.Distance(this.p.Position, this.LastCalledHomePos) > 0.1)`
`110`	`110`	`{`
`111`	`111`	`// Abort teleport, they moved.`
`112`		`- RocketChatManager.Say(this.p.SteamChannel.SteamPlayer.SteamPlayerID.CSteamID, String.Format(HomeCommand.Instance.Configuration.UnableMoveSinceMoveMsg, this.p.SteamChannel.SteamPlayer.SteamPlayerID.CharacterName));`
	`112`	`+ RocketChatManager.Say(this.p, String.Format(HomeCommand.Instance.Configuration.UnableMoveSinceMoveMsg, this.p.CharacterName));`
`113`	`113`	`this.GoingHome = false;`
`114`	`114`	`this.cangohome = false;`
`115`	`115`	`return;`