Partial Saving

lukegb · Feb 14, 2012 · 7a45d20 · 7a45d20
1 parent 6158e7d
commit 7a45d20
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 20 deletions.
diff --git a/...n/java/org/spout/vanilla/protocol/bootstrap/handler/BootstrapHandshakeMessageHandler.java b/...n/java/org/spout/vanilla/protocol/bootstrap/handler/BootstrapHandshakeMessageHandler.java
@@ -25,7 +25,6 @@
  */
 package org.spout.vanilla.protocol.bootstrap.handler;
 
-import org.spout.api.Commons;
 import org.spout.api.player.Player;
 import org.spout.api.protocol.MessageHandler;
 import org.spout.api.protocol.Session;
@@ -34,19 +33,17 @@
 public class BootstrapHandshakeMessageHandler extends MessageHandler<HandshakeMessage> {
 	@Override
 	public void handle(Session session, Player player, HandshakeMessage message) {
-		if (Commons.isSpout) {
-			Session.State state = session.getState();
-			if (state == Session.State.EXCHANGE_HANDSHAKE) {
-				session.setState(Session.State.EXCHANGE_IDENTIFICATION);
-				// TODO
-				//if (session.getServer().getOnlineMode()) {
-				//	session.send(new HandshakeMessage(session.getSessionId()));
-				//} else {
+		Session.State state = session.getState();
+		if (state == Session.State.EXCHANGE_HANDSHAKE) {
+			session.setState(Session.State.EXCHANGE_IDENTIFICATION);
+			// TODO
+			//if (session.getServer().getOnlineMode()) {
+			//	session.send(new HandshakeMessage(session.getSessionId()));
+			//} else {
 				session.send(new HandshakeMessage("-"));
-				//}
-			} else {
-				session.disconnect("Handshake already exchanged.");
-			}
+			//}
+		} else {
+			session.disconnect("Handshake already exchanged.");
 		}
 	}
 }
diff --git a/...a/org/spout/vanilla/protocol/bootstrap/handler/BootstrapIdentificationMessageHandler.java b/...a/org/spout/vanilla/protocol/bootstrap/handler/BootstrapIdentificationMessageHandler.java
@@ -25,7 +25,6 @@
  */
 package org.spout.vanilla.protocol.bootstrap.handler;
 
-import org.spout.api.Commons;
 import org.spout.api.event.Event;
 import org.spout.api.event.player.PlayerConnectEvent;
 import org.spout.api.player.Player;
@@ -36,9 +35,7 @@
 public class BootstrapIdentificationMessageHandler extends MessageHandler<IdentificationMessage> {
 	@Override
 	public void handle(Session session, Player player, IdentificationMessage message) {
-		if (Commons.isSpout) {
-			Event event = new PlayerConnectEvent(session, message.getName());
-			session.getGame().getEventManager().callEvent(event);
-		}
+		Event event = new PlayerConnectEvent(session, message.getName());
+		session.getGame().getEventManager().callEvent(event);
 	}
 }
diff --git a/src/main/java/org/spout/vanilla/protocol/handler/PositionRotationMessageHandler.java b/src/main/java/org/spout/vanilla/protocol/handler/PositionRotationMessageHandler.java
@@ -58,9 +58,13 @@ public void handleServer(Session session, Player player, PositionRotationMessage
 		double z = message.getZ();
 
 		Transform liveTransform = entity.getLiveTransform();
-		World w = liveTransform.getPosition().getWorld();
+
+		liveTransform.getPosition().setX((float) x);
+		liveTransform.getPosition().setX((float) y);
+		liveTransform.getPosition().setX((float) z);
+
 		// TODO - is this rotation correct?
-		entity.setTransform(new Transform(new Point(w, (float) x, ((float) y), (float) z), new Quaternion(pitch, Vector3.UNIT_Z).rotate(rot, Vector3.UNIT_Y), Vector3.Forward));
+		liveTransform.getRotation().rotate(rot, Vector3.UNIT_Y);
 	}
 
 	@Override