projectswg/NGECore2
1
0
Fork 0
mirror of https://github.com/ProjectSWGCore/NGECore2.git synced 2026-07-30 00:15:57 -04:00
Code Issues Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/ProjectSWGCore/NGECore2

Browse Source 
Conflicts:
	scripts/radial/vehicle.py
	src/main/NGECore.java
	src/resources/objects/creature/CreatureObject.java
	src/resources/objects/player/PlayerObject.java
	src/resources/objects/tangible/TangibleObject.java
	src/services/SimulationService.java
	src/services/combat/CombatService.java
	src/services/object/ObjectService.java
This commit is contained in:
Treeku
2014-04-18 21:10:53 +01:00
parent f58b7b6a5b 29ce1d42a5
commit e8a1959f9d
219 changed files with 4655 additions and 733 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/services/SimulationService.java
+13
View File
@@ -85,6 +85,7 @@ import resources.datatables.Options;
import resources.datatables.PlayerFlags;
import resources.datatables.Posture;
import services.ai.LairActor;
import services.chat.ChatRoom;
import toxi.geom.Line3D;
import toxi.geom.Ray3D;
import toxi.geom.Vec3D;
@@ -845,6 +846,18 @@ public class SimulationService implements INetworkDispatch {
if(object.getPosture() == Posture.Dead)
core.playerService.sendCloningWindow(object, false);
ChatRoom zoneRoom = core.chatService.getChatRoomByAddress("SWG." + core.getGalaxyName() + "." + object.getPlanet().getName() + ".Planet");
if (zoneRoom != null) {
String chatName = object.getCustomName().toLowerCase();
if (chatName.contains(" "))
chatName = chatName.split(" ")[0];
if (!zoneRoom.getUserList().contains(chatName)) {
core.chatService.joinChatRoom(chatName, zoneRoom.getRoomId(), true);
}
}
}
public void transferToPlanet(SWGObject object, Planet planet, Point3D newPos, Quaternion newOrientation, SWGObject newParent) {