projectswg/NGECore2
1
0
Fork 0
mirror of https://github.com/ProjectSWGCore/NGECore2.git synced 2026-09-21 06:13:13 -04:00
Code Issues Projects Releases Wiki Activity

Changed ITV Despawn code to just despawn after 30 seconds

Browse Source 
Removed distance despawn
This commit is contained in:
tacef
2014-07-03 19:49:13 +02:00
parent c706107cdd
commit 077d252d89
2 changed files with 2 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files
scripts/commands/callforrattletrappickup.py
-1
View File
@@ -31,7 +31,6 @@ def run(core, actor, target, commandstring):
actor.sendSystemMessage('@travel:no_pickup_location', 0)
return
core.travelService.checkForItvDistanceDespawn(actor, object)
core.travelService.checkForItvTimedDespawn(actor, object)
src/services/travel/TravelService.java
+2 -29
View File
@@ -433,49 +433,22 @@ public class TravelService implements INetworkDispatch {
}
//ITV Despawn
public void checkForItvDistanceDespawn(CreatureObject actor, SWGObject object){
ScheduledFuture<?> distanceDespawnTask = Executors.newScheduledThreadPool(1).scheduleAtFixedRate(new Runnable() {
public void run() {
try {
if (object != null){
if (actor.getPosition().getDistance2D(object.getPosition()) >= 50){
core.objectService.destroyObject(object.getObjectID());
actor.sendSystemMessage("@travel:pickup_cancel", DisplayType.Broadcast);
((ScheduledFuture<?>)actor.getAttachment("distanceDespawn")).cancel(true);
}
}
}catch (Exception e) {
e.printStackTrace();
}
}
}, 1, 1, TimeUnit.SECONDS);
actor.setAttachment("distanceDespawn", distanceDespawnTask);
}
public void checkForItvTimedDespawn(CreatureObject actor, SWGObject object){
ScheduledFuture<?> timedDespawnTask = Executors.newScheduledThreadPool(1).scheduleAtFixedRate(new Runnable() {
Executors.newScheduledThreadPool(1).schedule(new Runnable() {
public void run() {
try {
if (object != null){
Thread.sleep(60000);
core.objectService.destroyObject(object);
actor.sendSystemMessage("@travel:pickup_timeout", DisplayType.Broadcast);
((ScheduledFuture<?>)actor.getAttachment("timedDespawn")).cancel(true);
}
}catch (Exception e) {
e.printStackTrace();
}
}
}, 1, 1 , TimeUnit.SECONDS);
actor.setAttachment("timedDespawn", timedDespawnTask);
}, 30, TimeUnit.SECONDS);
}