Fix bow direction (follow head).

New property in config. Add redstone item (not implemented).
CRBairdUSA · Jul 22, 2016 · a723864 · a723864
1 parent 91cc2d2
commit a723864
Show file tree

Hide file tree

Showing 7 changed files with 40 additions and 8 deletions.
diff --git a/src/MiNET/MiNET/Items/ItemBow.cs b/src/MiNET/MiNET/Items/ItemBow.cs
@@ -47,7 +47,7 @@ public override void Release(Level world, Player player, BlockCoordinates blockC
 			arrow.KnownPosition = (PlayerLocation) player.KnownPosition.Clone();
 			arrow.KnownPosition.Y += 1.62f;
 
-			arrow.Velocity = arrow.KnownPosition.GetDirection()*(force*2.0f*1.5f);
+			arrow.Velocity = arrow.KnownPosition.GetHeadDirection()*(force*2.0f*1.5f);
 			arrow.KnownPosition.Yaw = (float) arrow.Velocity.GetYaw();
 			arrow.KnownPosition.Pitch = (float) arrow.Velocity.GetPitch();
 			arrow.BroadcastMovement = false;

diff --git a/src/MiNET/MiNET/Items/ItemFactory.cs b/src/MiNET/MiNET/Items/ItemFactory.cs
@@ -95,6 +95,7 @@ public static Item GetItem(short id, short metadata = 0, byte count = 1)
 			else if (id == 323) item = new ItemSign();
 			else if (id == 324) item = new ItemDoor();
 			else if (id == 325) item = new ItemBucket(metadata);
+			else if (id == 331) item = new ItemRedstone();
 			else if (id == 332) item = new ItemSnowball();
 			else if (id == 344) item = new ItemEgg();
 			else if (id == 345) item = new ItemCompass();

diff --git a/src/MiNET/MiNET/Items/ItemRedstone.cs b/src/MiNET/MiNET/Items/ItemRedstone.cs
@@ -0,0 +1,9 @@
+namespace MiNET.Items
+{
+	public class ItemRedstone : Item
+	{
+		public ItemRedstone() : base(331)
+		{
+		}
+	}
+}
diff --git a/src/MiNET/MiNET/MiNET.csproj b/src/MiNET/MiNET/MiNET.csproj
@@ -401,6 +401,7 @@
     <Compile Include="Items\ItemPotato.cs" />
     <Compile Include="Items\ItemPotion.cs" />
     <Compile Include="Items\ItemPumpkinPie.cs" />
+    <Compile Include="Items\ItemRedstone.cs" />
     <Compile Include="Items\ItemSign.cs" />
     <Compile Include="Items\ItemShovel.cs" />
     <Compile Include="Items\ItemSlab.cs" />

diff --git a/src/MiNET/MiNET/MiNetServer.cs b/src/MiNET/MiNET/MiNetServer.cs
@@ -60,9 +60,11 @@ public class MiNetServer
 
 		public MiNetServer()
 		{
+			ServerRole = Config.GetProperty("ServerRole", ServerRole.Full);
+			InacvitityTimeout = Config.GetProperty("InactivityTimeout", 8500);
 		}
 
-		public MiNetServer(IPEndPoint endpoint)
+		public MiNetServer(IPEndPoint endpoint): base()
 		{
 			Endpoint = endpoint;
 		}
@@ -96,8 +98,6 @@ public bool StartServer()
 			{
 				Log.Info("Initializing...");
 
-				InacvitityTimeout = Config.GetProperty("InactivityTimeout", 8500);
-
 				if (ServerRole == ServerRole.Full || ServerRole == ServerRole.Proxy)
 				{
 					if (Endpoint == null)

diff --git a/src/MiNET/MiNET/Utils/Config.cs b/src/MiNET/MiNET/Utils/Config.cs
@@ -43,6 +43,27 @@ static Config()
 			}
 		}
 
+		public static ServerRole GetProperty(string property, ServerRole defaultValue)
+		{
+			string value = ReadString(property);
+			if (value == null) return defaultValue;
+
+			switch (value.ToLower())
+			{
+				case "1":
+				case "node":
+					return ServerRole.Node;
+				case "0":
+				case "proxy":
+					return ServerRole.Proxy;
+				case "2":
+				case "full":
+					return ServerRole.Full;
+				default:
+					return defaultValue;
+			}
+		}
+
 		public static GameMode GetProperty(string property, GameMode defaultValue)
 		{
 			string value = ReadString(property);

diff --git a/src/MiNET/MiNET/Utils/Vector3.cs b/src/MiNET/MiNET/Utils/Vector3.cs
@@ -16,14 +16,14 @@ public static double GetPitch(this Vector3 vector)
 			return ToDegrees(Math.Atan2(vector.Y, distance));
 		}
 
-		public static float ToRadians(this float angle)
+		public static double ToRadians(this float angle)
 		{
-			return (float) ((Math.PI/180)*angle);
+			return (Math.PI/180.0f)*angle;
 		}
 
-		public static float ToDegrees(this double angle)
+		public static double ToDegrees(this double angle)
 		{
-			return (float) (angle*(180.0/Math.PI));
+			return angle*(180.0f/Math.PI);
 		}
 	}