From 1f24dac32016c5865088af8a8fc83007795c5958 Mon Sep 17 00:00:00 2001
From: Obique PSWG <obique.pswg@gmail.com>
Date: Thu, 11 Jun 2015 07:42:16 -0500
Subject: [PATCH] Renamed ZoneInIntent to RequestZoneInIntent to avoid
 confusion

---
 .../{ZoneInIntent.java => RequestZoneInIntent.java}       | 4 ++--
 src/services/objects/ObjectManager.java                   | 4 ++--
 src/services/player/ZoneService.java                      | 8 ++++----
 3 files changed, 8 insertions(+), 8 deletions(-)
 rename src/intents/{ZoneInIntent.java => RequestZoneInIntent.java} (84%)

diff --git a/src/intents/ZoneInIntent.java b/src/intents/RequestZoneInIntent.java
similarity index 84%
rename from src/intents/ZoneInIntent.java
rename to src/intents/RequestZoneInIntent.java
index b17b43d4..fb89a219 100644
--- a/src/intents/ZoneInIntent.java
+++ b/src/intents/RequestZoneInIntent.java
@@ -4,7 +4,7 @@ import resources.control.Intent;
 import resources.objects.creature.CreatureObject;
 import resources.player.Player;
 
-public class ZoneInIntent extends Intent {
+public class RequestZoneInIntent extends Intent {
 	
 	public static final String TYPE = "ZoneInIntent";
 	
@@ -12,7 +12,7 @@ public class ZoneInIntent extends Intent {
 	private CreatureObject creature;
 	private String galaxy;
 	
-	public ZoneInIntent(Player player, CreatureObject creature, String galaxy) {
+	public RequestZoneInIntent(Player player, CreatureObject creature, String galaxy) {
 		super(TYPE);
 		setPlayer(player);
 		setCreature(creature);
diff --git a/src/services/objects/ObjectManager.java b/src/services/objects/ObjectManager.java
index a7dd4bd6..02236559 100644
--- a/src/services/objects/ObjectManager.java
+++ b/src/services/objects/ObjectManager.java
@@ -29,7 +29,7 @@ package services.objects;
 
 import intents.ObjectTeleportIntent;
 import intents.PlayerEventIntent;
-import intents.ZoneInIntent;
+import intents.RequestZoneInIntent;
 import intents.network.GalacticPacketIntent;
 
 import java.util.*;
@@ -357,7 +357,7 @@ public class ObjectManager extends Manager {
 			return;
 		}
 		objectAwareness.add(creatureObj);
-		new ZoneInIntent(player, (CreatureObject) creatureObj, galaxy).broadcast();
+		new RequestZoneInIntent(player, (CreatureObject) creatureObj, galaxy).broadcast();
 	}
 	
 	private long getNextObjectId() {
diff --git a/src/services/player/ZoneService.java b/src/services/player/ZoneService.java
index a3156010..1389a50e 100644
--- a/src/services/player/ZoneService.java
+++ b/src/services/player/ZoneService.java
@@ -29,7 +29,7 @@ package services.player;
 
 import intents.GalacticIntent;
 import intents.PlayerEventIntent;
-import intents.ZoneInIntent;
+import intents.RequestZoneInIntent;
 
 import java.io.File;
 import java.io.IOException;
@@ -140,7 +140,7 @@ public class ZoneService extends Service {
 		loadCommitHistory();
 		if (!nameFilter.load())
 			System.err.println("Failed to load name filter!");
-		registerForIntent(ZoneInIntent.TYPE);
+		registerForIntent(RequestZoneInIntent.TYPE);
 		return super.initialize();
 	}
 	
@@ -152,8 +152,8 @@ public class ZoneService extends Service {
 	
 	@Override
 	public void onIntentReceived(Intent i) {
-		if (i instanceof ZoneInIntent) {
-			ZoneInIntent zii = (ZoneInIntent) i;
+		if (i instanceof RequestZoneInIntent) {
+			RequestZoneInIntent zii = (RequestZoneInIntent) i;
 			zoneInPlayer(zii.getPlayer(), zii.getCreature(), zii.getGalaxy());
 		}
 	}