[Arianne-commits] stendhal/src/games/stendhal/server/entity Entity.java, 1.158, 1.159

[Deluge <ant...@us...>]

Update of /cvsroot/arianne/stendhal/src/games/stendhal/server/entity
In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv6242/src/games/stendhal/server/entity

Modified Files:
	Entity.java 
Log Message:
Removed "int originX" and "int originY" and replaced with "Point origin".

Index: Entity.java
===================================================================
RCS file: /cvsroot/arianne/stendhal/src/games/stendhal/server/entity/Entity.java,v
retrieving revision 1.158
retrieving revision 1.159
diff -C2 -d -r1.158 -r1.159
*** Entity.java	24 May 2013 19:13:08 -0000	1.158
--- Entity.java	24 May 2013 20:32:36 -0000	1.159
***************
*** 20,23 ****
--- 20,24 ----
  import games.stendhal.server.entity.slot.EntitySlot;
  
+ import java.awt.Point;
  import java.awt.Rectangle;
  import java.awt.geom.Rectangle2D;
***************
*** 45,51 ****
  
      // Initial coordinates
!     private int originX;
!     
!     private int originY;
  
  	/**
--- 46,50 ----
  
      // Initial coordinates
!     private Point origin;
  
  	/**
***************
*** 599,605 ****
  
          // Set the original position of the entity
!         if ((Integer)originX == null || (Integer)originY == null) {
!             originX = x;
!             originY = y;
          }
  
--- 598,603 ----
  
          // Set the original position of the entity
!         if (origin == null) {
!             origin = new Point(x, y);
          }