From 4aee40c0fd7347fbfc2e1f40a1da7b360eec2500 Mon Sep 17 00:00:00 2001
From: Waverunner <lewaverunner@gmail.com>
Date: Mon, 8 Jun 2015 17:59:19 -0400
Subject: [PATCH] Added cell labels for showing labels on the minimap,
 SWGNameGenerator no longer throws an error on null NameFilter, updated city
 map locations to points provided by Undercova

---
 serverdata/map/static_city_points.iff       | Bin 1027 -> 994 bytes
 src/resources/objects/cell/CellObject.java  |  21 ++++++++++++++------
 src/utilities/namegen/SWGNameGenerator.java |   2 +-
 3 files changed, 16 insertions(+), 7 deletions(-)

diff --git a/serverdata/map/static_city_points.iff b/serverdata/map/static_city_points.iff
index cae348f5d9ba52aef8731b144eb9a4ab90ee88f2..203a46d467142f3289bf43cb43c075ee1887edb5 100644
GIT binary patch
delta 546
zcmY*WL2DC17=1~==B9^&ks@6b^dj^kR1qXJJK7M}7Kv5x^l7GM%ycHsZiODi0WTg6
zORF9PD~h0(_3Fhyv!1k2=&4>r5Ip)5{9=RA(+uyu@4ffUJS=~on7puXB?3x&VY6Nz
z-M4#_v&D^Ly{MwA*9EYiCzM#LjKrLbli`W#(*gYQn22l~h`38Ye>TUrviLjlhcQW;
zDSQaw8)NDktu2!SvdtXXm)_3d>CbcUZ~k{}lIn1vw*o$$D4aTf=rso%&2L#JwN}KP
zGzCj4PDlg6u0WQJ$%b{o66-kK-^hWB>D|JS1O5`5y-gn%Di83E(LrwLrnP9crEKwX
z+d2AI#Xi=MP8#k$zXks_+{Yp-4JQK|?6W=^4y8PKhk`{(9e#!90{A!>Sx~D*ZdhTH
z^*h2@r*N6vik4*tUvh(k=}htdS-)F@Kgav))tCiwd$`j4BZ0~*u}1flIgLmeWo`!x
zt4Y_!2~R)U!p|q^kK&mVev1EOO0>v~err)VO5{J<Pa(3jR*KU1rJ3V<HQ<HNwuAag
PS2{&{ti-PY`qlh56mGsz

delta 571
zcmY*WF^CgE6n#n1OL;}W92O27=oNyE;)x*PvLl3Zy(sYnvB=kqX3XBqI=d0B5Q7$4
z8W&Crg&ZOlhoY5j#LQI|%C#1UU?*r{abV-DF1J|C@ZbCYy~q1Hb+24Gy>#9OO255U
zqmli83@gWr?`DU7H5gpxU~4v}SZk>S7DN=MFKX)(wA(r0>xl6vB%poFg6-kED}NCc
zcT;HH1M_m|BCTE{1F(_B^vB`neFxYA*vtQ~wn+AzU{g6K$yDL+sgYx|8GBV55d@N)
zr-0b9jA9CaaEoL6Z4NGK!<HS-sgEyMjJ)J#VP@~>3`h7nd0434nSNz~_g2vrt<mZV
z(E$b<7TXW_zuBTNLIL>hVLX@3d@Yny27Ao$Yb{&$ggA7ASW{5X`FP}fY)rBf)aj6M
z{MrkSolo3oBXO3@N+8NWng^BSNb&XwY}GM7>GB8t$PuD$8mW5MC4bIW>6TPS;Y%ge
zb+*)xLmkD=*V7LuKS{n7=MRFpPWJN-sjRK0G!%=RJJ|HFlhjLo^<1A^s<cXWNvD0j
j*|ZpRz2tsre)dZpbI*97duXhL!bl486Zkp7xMu$VjIzY=

diff --git a/src/resources/objects/cell/CellObject.java b/src/resources/objects/cell/CellObject.java
index cd01811c2..b1bfbcba7 100644
--- a/src/resources/objects/cell/CellObject.java
+++ b/src/resources/objects/cell/CellObject.java
@@ -40,7 +40,10 @@ public class CellObject extends SWGObject {
 	private boolean	isPublic	= true;
 	private int		number		= 0;
 	private String	label		= "";
-	
+
+	private float label_x       = 0f;
+	private float label_z       = 0f;
+
 	public CellObject(long objectId) {
 		super(objectId, BaselineType.SCLT);
 	}
@@ -68,7 +71,12 @@ public class CellObject extends SWGObject {
 	public void setLabel(String label) {
 		this.label = label;
 	}
-	
+
+	public void setLabelMapPosition(float x, float z) {
+		this.label_x = x;
+		this.label_z = z;
+	}
+
 	protected void sendBaselines(Player target) {
 		BaselineBuilder bb = new BaselineBuilder(this, BaselineType.SCLT, 3);
 		createBaseline3(target, bb);
@@ -82,16 +90,17 @@ public class CellObject extends SWGObject {
 	
 	public void createBaseline3(Player target, BaselineBuilder bb) {
 		super.createBaseline3(target, bb);
-		bb.addByte(1); // isPublic
+		bb.addBoolean(isPublic);
 		bb.addInt(number);
 		bb.incrementOperandCount(2);
 	}
 	
 	public void createBaseline6(Player target, BaselineBuilder bb) {
 		super.createBaseline6(target, bb);
-		bb.addLong(0);
-		bb.addLong(0);
+		bb.addUnicode(label);
+		bb.addFloat(label_x);
+		bb.addFloat((float) 0);
+		bb.addFloat(label_z);
 		bb.incrementOperandCount(2);
 	}
-	
 }
diff --git a/src/utilities/namegen/SWGNameGenerator.java b/src/utilities/namegen/SWGNameGenerator.java
index 2432085b5..d455f20cb 100644
--- a/src/utilities/namegen/SWGNameGenerator.java
+++ b/src/utilities/namegen/SWGNameGenerator.java
@@ -124,7 +124,7 @@ public class SWGNameGenerator {
 			return "";
 		
 		String name = null;
-		while (name == null || !nameFilter.isValid(name)) {
+		while (name == null || (nameFilter != null && !nameFilter.isValid(name))) {
 			name = getNameByRule(ruleMap.get(race));
 			// Some reason a name can be empty, I think it has to do with the removeExcessDuplications check.
 			if (name.isEmpty())