Sync with diff on server box

Treeku · Treeku · commit 2d4f115ff5f0 · 2013-12-23T20:01:12.000Z
aka Light's fixes
diff --git a/src/main/NGECore.java b/src/main/NGECore.java
@@ -113,6 +113,8 @@ public class NGECore {
 
 	private volatile boolean isShuttingDown = false;
 	
+	private long galacticTime = System.currentTimeMillis();
+	
 	private ConcurrentHashMap<IoSession, Client> clients = new ConcurrentHashMap<IoSession, Client>();
 	
 	// Database
@@ -542,5 +544,9 @@ public void initiateShutdown() {
 		
 	}
 	
+	public long getGalacticTime() {
+		return System.currentTimeMillis() - this.galacticTime;
+	}
+	
 }
 
diff --git a/src/resources/common/SpawnPoint.java b/src/resources/common/SpawnPoint.java
@@ -25,6 +25,9 @@
 
 import engine.resources.scene.Point3D;
 import engine.resources.scene.Quaternion;
+import java.util.Random;
+import main.NGECore;
+import services.TerrainService;
 
 @Persistent
 public class SpawnPoint {
@@ -80,4 +83,24 @@ public void setCellNumber(int cellNumber) {
 		this.cellNumber = cellNumber;
 	}
 
+	public Point3D getRandomPosition(float minDistance, float maxDistance) {
+		Random random = new Random();
+		float distance = random.nextInt((int)(maxDistance - minDistance) + 1) + minDistance;
+		float angle = (float)(random.nextInt(360) * 0.0174532925199433D);
+		float x = (float)(this.position.x + distance * Math.cos(angle));
+		float z = (float)(this.position.z + distance * Math.sin(angle));
+		
+		return new Point3D(x, 0.0F, z);
+	}
+
+	public static Point3D getRandomPosition(Point3D position, float minDistance, float maxDistance, int planetId) {
+		Random random = new Random();
+		float distance = random.nextInt((int)(maxDistance - minDistance) + 1) + minDistance;
+		float angle = (float)(random.nextInt(360) * 0.0174532925199433D);
+		float x = (float)(position.x + distance * Math.cos(angle));
+		float z = (float)(position.z + distance * Math.sin(angle));
+		
+		return new Point3D(x, NGECore.getInstance().terrainService.getHeight(planetId, x, z), z);
+	}
+
 }
diff --git a/src/resources/objects/ObjectMessageBuilder.java b/src/resources/objects/ObjectMessageBuilder.java
@@ -63,7 +63,7 @@ public IoBuffer createBaseline(String objectType, byte viewType, IoBuffer data,
 	}
 	
 	public IoBuffer createDelta(String objectType, byte viewType, short updateCount, short updateType, IoBuffer data, int size) {
-		IoBuffer buffer = bufferPool.allocate(27 + size, false).order(ByteOrder.LITTLE_ENDIAN);
+		IoBuffer buffer = bufferPool.allocate(23 + size, false).order(ByteOrder.LITTLE_ENDIAN);
 		
 		buffer.putShort((short) 5);
 		buffer.putInt(Opcodes.DeltasMessage);
diff --git a/src/resources/objects/guild/GuildMessageBuilder.java b/src/resources/objects/guild/GuildMessageBuilder.java
@@ -77,6 +77,7 @@ public IoBuffer buildBaseline6() {
 		for (Entry<String, OtherServerGCWZonePercent> entry : guilds.getOtherServerGCWTotalPercentMap().entries()) capacity += (11 + entry.getKey().length() + entry.getValue().getBytes().length);
 		
 		IoBuffer buffer = bufferPool.allocate(capacity, false).order(ByteOrder.LITTLE_ENDIAN);
+		buffer.setAutoExpand(true);
 		buffer.putShort((short) 9);	// Object Count
 		buffer.putInt(guilds.getServerId());
 		buffer.put(getAsciiString(guilds.getSTFFile()));
diff --git a/src/resources/objects/player/PlayerMessageBuilder.java b/src/resources/objects/player/PlayerMessageBuilder.java
@@ -611,7 +611,7 @@ public IoBuffer buildIgnoreRemoveDelta(List<String> ignoreList) {
 	}
 	
 	public IoBuffer buildFlagBitmask(int bitmask) {
-		IoBuffer buffer = bufferPool.allocate(30, false).order(ByteOrder.LITTLE_ENDIAN);
+		IoBuffer buffer = bufferPool.allocate(20, false).order(ByteOrder.LITTLE_ENDIAN);
 		buffer.putInt(4);
 		buffer.putInt(bitmask);
 		buffer.putInt(0);
diff --git a/src/resources/objects/player/PlayerObject.java b/src/resources/objects/player/PlayerObject.java
@@ -195,7 +195,7 @@ public void setTotalPlayTime(int totalPlayTime) {
 		synchronized(objectMutex) {
 			this.totalPlayTime = totalPlayTime;
 		}
-		getContainer().notifyObservers(messageBuilder.buildTotalPlayTimeDelta(totalPlayTime), true);
+		notifyObservers(messageBuilder.buildTotalPlayTimeDelta(totalPlayTime), true);
 	}
 
 	public String getHome() {
diff --git a/src/resources/objects/tangible/TangibleMessageBuilder.java b/src/resources/objects/tangible/TangibleMessageBuilder.java
@@ -63,8 +63,8 @@ public IoBuffer buildBaseline3() {
 		buffer.putInt(0);
 		buffer.putInt(0); 
 		
-		buffer.putInt(0); 
-		//buffer.putInt(tangible.getOptionsBitmask());
+		//buffer.putInt(0); 
+		buffer.putInt(tangible.getOptionsBitmask());
 		buffer.putInt(0); // number of item uses
 		buffer.putInt(tangible.getConditionDamage());
 		buffer.putInt(tangible.getMaxDamage());
diff --git a/src/resources/objects/tangible/TangibleObject.java b/src/resources/objects/tangible/TangibleObject.java
@@ -357,8 +357,6 @@ public void sendBaselines(Client destination) {
 		
 		destination.getSession().write(messageBuilder.buildBaseline3());
 		destination.getSession().write(messageBuilder.buildBaseline6());
-		destination.getSession().write(messageBuilder.buildBaseline8());
-		destination.getSession().write(messageBuilder.buildBaseline9());
 		
 		if(getPvPBitmask() != 0) {
 			UpdatePVPStatusMessage upvpm = new UpdatePVPStatusMessage(getObjectID());
diff --git a/src/services/CharacterService.java b/src/services/CharacterService.java
@@ -230,7 +230,7 @@ public void handlePacket(IoSession session, IoBuffer data) throws Exception {
 				object.setCustomName(clientCreateCharacter.getName());
 				object.setHeight(clientCreateCharacter.getScale());
 				object.setPersistent(true);
-				object.setPosition(new Point3D(3528, 0, -4804));
+				object.setPosition(SpawnPoint.getRandomPosition(new Point3D(3528, 0, -4804), (float) 0.5, 3, core.terrainService.getPlanetByName("tatooine").getID()));
 				object.setCashCredits(100);
 				object.setBankCredits(1000);
 				object.setOptionsBitmask(Options.ATTACKABLE);
diff --git a/src/services/ConnectionService.java b/src/services/ConnectionService.java
@@ -219,8 +219,6 @@ public void disconnect(IoSession session) {
 			core.chatService.playerStatusChange(objectShortName, (byte) 0);
 		}
 		
-		session.suspendWrite();
-		
 		long parentId = object.getParentId();
 		
 		if(object.getContainer() == null) {
@@ -243,6 +241,7 @@ public void disconnect(IoSession session) {
 		ghost.toggleFlag(PlayerFlags.LD);
 		
 		object.setAttachment("disconnectTask", null);
+		object.setAttachment("buffWorkshop", null);
 		object.createTransaction(core.getCreatureODB().getEnvironment());
 		core.getCreatureODB().put(object, Long.class, CreatureObject.class, object.getTransaction());
 		object.getTransaction().commitSync();
diff --git a/src/services/PlayerService.java b/src/services/PlayerService.java
@@ -29,7 +29,6 @@
 import java.util.Map.Entry;
 import java.util.Random;
 import java.util.Vector;
-import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.Executors;
 import java.util.concurrent.ScheduledExecutorService;
 import java.util.concurrent.TimeUnit;
@@ -85,26 +84,21 @@ public class PlayerService implements INetworkDispatch {
     
 	public PlayerService(final NGECore core) {
 		this.core = core;
+		
+	}
+	
+	public void postZoneIn(final CreatureObject creature) {
+		
 		scheduler.scheduleAtFixedRate(new Runnable() {
 
 			@Override
 			public void run() {
 				ServerTimeMessage time = new ServerTimeMessage(System.currentTimeMillis() / 1000);
 				IoBuffer packet = time.serialize();
-				synchronized(core.getActiveConnectionsMap()) {
-					for(Client c : core.getActiveConnectionsMap().values()) {
-						if(c.getParent() != null) {
-							c.getSession().write(packet);
-						}
-					}
-				}
+				creature.getClient().getSession().write(packet);
 			}
 			
-		}, 0, 30, TimeUnit.SECONDS);
-		
-	}
-	
-	public void postZoneIn(final CreatureObject creature) {
+		}, 0, 45, TimeUnit.SECONDS);
 		
 		scheduler.scheduleAtFixedRate(new Runnable() {
 
@@ -148,6 +142,11 @@ public void run() {
 			
 		}, 0, 1000, TimeUnit.MILLISECONDS);
 		
+		PlayerObject ghost = (PlayerObject)creature.getSlottedObject("ghost");
+		
+		if(ghost.isSet(256))
+			ghost.toggleFlag(256);
+		
 
 	}
 
diff --git a/src/services/SimulationService.java b/src/services/SimulationService.java
@@ -570,7 +570,9 @@ public void handleDisconnect(final IoSession session) {
 		
 		//session.suspendWrite();
 		
-		ghost.toggleFlag(PlayerFlags.LD);
+		if(!ghost.isSet(PlayerFlags.LD)) {
+			ghost.toggleFlag(PlayerFlags.LD);
+		}
 		
 		/*
 		object.createTransaction(core.getCreatureODB().getEnvironment());
@@ -617,10 +619,6 @@ public void handleZoneIn(Client client) {
 		
 		PlayerObject ghost = (PlayerObject) object.getSlottedObject("ghost");
 		
-		if (ghost.isSet(PlayerFlags.LD)) {
-			ghost.toggleFlag(PlayerFlags.LD);
-		}
-		
 		core.weatherService.sendWeather(object);
 		
 		if (!object.hasSkill(ghost.getProfessionWheelPosition())) {
diff --git a/src/services/object/ObjectService.java b/src/services/object/ObjectService.java
@@ -120,11 +120,8 @@ public void run() {
 		    	synchronized(objectList) {
 		    		for(SWGObject obj : objectList.values()) {
 		    			
-		    			if(obj.getSlottedObject("ghost") != null) {
-		    				CreatureObject creature = (CreatureObject) obj;
-		    				creature.setAttachment("disconnectTask", null);
-		    				creature.createTransaction(core.getCreatureODB().getEnvironment());
-		    				core.getCreatureODB().put(creature, Long.class, CreatureObject.class, creature.getTransaction());
+		    			if((obj.getClient() != null) && (obj.getClient().getSession() != null)) {
+		    				core.connectionService.disconnect(obj.getClient().getSession());
 		    			}
 		    			
 		    		}

Original file line number	Diff line number	Diff line change
`@@ -113,6 +113,8 @@ public class NGECore {`
`113`	`113`
`114`	`114`	`private volatile boolean isShuttingDown = false;`
`115`	`115`
	`116`	`+ private long galacticTime = System.currentTimeMillis();`
	`117`	`+`
`116`	`118`	`private ConcurrentHashMap<IoSession, Client> clients = new ConcurrentHashMap<IoSession, Client>();`
`117`	`119`
`118`	`120`	`// Database`
`@@ -542,5 +544,9 @@ public void initiateShutdown() {`
`542`	`544`
`543`	`545`	`}`
`544`	`546`
	`547`	`+ public long getGalacticTime() {`
	`548`	`+ return System.currentTimeMillis() - this.galacticTime;`
	`549`	`+ }`
	`550`	`+`
`545`	`551`	`}`
`546`	`552`
Original file line number	Diff line number	Diff line change
`@@ -63,7 +63,7 @@ public IoBuffer createBaseline(String objectType, byte viewType, IoBuffer data,`
`63`	`63`	`}`
`64`	`64`
`65`	`65`	`public IoBuffer createDelta(String objectType, byte viewType, short updateCount, short updateType, IoBuffer data, int size) {`
`66`		`- IoBuffer buffer = bufferPool.allocate(27 + size, false).order(ByteOrder.LITTLE_ENDIAN);`
	`66`	`+ IoBuffer buffer = bufferPool.allocate(23 + size, false).order(ByteOrder.LITTLE_ENDIAN);`
`67`	`67`
`68`	`68`	`buffer.putShort((short) 5);`
`69`	`69`	`buffer.putInt(Opcodes.DeltasMessage);`
Original file line number	Diff line number	Diff line change
`@@ -611,7 +611,7 @@ public IoBuffer buildIgnoreRemoveDelta(List<String> ignoreList) {`
`611`	`611`	`}`
`612`	`612`
`613`	`613`	`public IoBuffer buildFlagBitmask(int bitmask) {`
`614`		`- IoBuffer buffer = bufferPool.allocate(30, false).order(ByteOrder.LITTLE_ENDIAN);`
	`614`	`+ IoBuffer buffer = bufferPool.allocate(20, false).order(ByteOrder.LITTLE_ENDIAN);`
`615`	`615`	`buffer.putInt(4);`
`616`	`616`	`buffer.putInt(bitmask);`
`617`	`617`	`buffer.putInt(0);`
Original file line number	Diff line number	Diff line change
`@@ -195,7 +195,7 @@ public void setTotalPlayTime(int totalPlayTime) {`
`195`	`195`	`synchronized(objectMutex) {`
`196`	`196`	`this.totalPlayTime = totalPlayTime;`
`197`	`197`	`}`
`198`		`- getContainer().notifyObservers(messageBuilder.buildTotalPlayTimeDelta(totalPlayTime), true);`
	`198`	`+ notifyObservers(messageBuilder.buildTotalPlayTimeDelta(totalPlayTime), true);`
`199`	`199`	`}`
`200`	`200`
`201`	`201`	`public String getHome() {`