projectswg/NGECore2
1
0
Fork 0
mirror of https://github.com/ProjectSWGCore/NGECore2.git synced 2026-08-01 02:16:15 -04:00
Code Issues Projects Releases Wiki Activity

Conflict resolve

Browse Source
This commit is contained in:
CharonInferar
2014-05-20 19:45:58 +02:00
parent 2997e3eb24 f97ecc58d2
commit 4a402abfc9
713 changed files with 19834 additions and 3948 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/services/LootService.java
+2 -7
View File
@@ -21,12 +21,9 @@
******************************************************************************/
package services;
import java.io.File;
import java.io.IOException;
import java.nio.file.DirectoryStream;
import java.nio.file.DirectoryStream.Filter;
import java.nio.file.attribute.BasicFileAttributes;
import java.nio.file.FileSystems;
import java.nio.file.FileVisitResult;
import java.nio.file.FileVisitor;
import java.nio.file.Files;
@@ -41,8 +38,6 @@ import java.util.Map;
import java.util.Random;
import java.util.Vector;
import org.apache.commons.lang3.ArrayUtils;
import protocol.swg.PlayClientEffectObjectTransformMessage;
import protocol.swg.SceneCreateObjectByCrc;
import resources.loot.LootGroup;
@@ -795,7 +790,7 @@ public class LootService implements INetworkDispatch {
int finalMinDmg = 0;
int finalMaxDmg = 0;
String tunableObjectName = "";
@SuppressWarnings("unused") String tunableObjectName = "";
if (objectType.contains("powercrystal")){
tunableObjectName = "Power Crystal";
@@ -1043,7 +1038,7 @@ public class LootService implements INetworkDispatch {
float qz= 1.06535322E9F;
Point3D effectorPosition = new Point3D(0,y,0);
Quaternion effectorOrientation = new Quaternion(0,0,0,qz);
PlayClientEffectObjectTransformMessage lmsg = new PlayClientEffectObjectTransformMessage("",lootedObject.getObjectID(),"",effectorPosition,effectorOrientation);
//PlayClientEffectObjectTransformMessage lmsg = new PlayClientEffectObjectTransformMessage("",lootedObject.getObjectID(),"",effectorPosition,effectorOrientation);
//((CreatureObject) requester).getClient().getSession().write(lmsg.serialize());
}