From 966f207d104832ece954e87b1e3313702d936d90 Mon Sep 17 00:00:00 2001
From: Treeku <treeku@gmx.com>
Date: Sun, 4 May 2014 20:31:02 +0100
Subject: [PATCH] Temp changes until tested more

---
 src/services/PlayerService.java      | 2 +-
 src/services/gcw/FactionService.java | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/services/PlayerService.java b/src/services/PlayerService.java
index 3d29c632..efaa0919 100644
--- a/src/services/PlayerService.java
+++ b/src/services/PlayerService.java
@@ -126,7 +126,7 @@ public class PlayerService implements INetworkDispatch {
 			ServerTimeMessage time = new ServerTimeMessage(core.getGalacticTime() / 1000);
 			IoBuffer packet = time.serialize();
 			creature.getClient().getSession().write(packet);
-		}, 5, 45, TimeUnit.SECONDS));
+		}, 45, 45, TimeUnit.SECONDS));
 		
 		scheduleList.add(scheduler.scheduleAtFixedRate(() -> {
 			if (creature.isInStealth() && !creature.getOption(Options.INVULNERABLE) && ((PlayerObject) creature.getSlottedObject("ghost")).getGodLevel() == 0) {
diff --git a/src/services/gcw/FactionService.java b/src/services/gcw/FactionService.java
index 1d8534cb..e7312318 100644
--- a/src/services/gcw/FactionService.java
+++ b/src/services/gcw/FactionService.java
@@ -296,7 +296,7 @@ public class FactionService implements INetworkDispatch {
 		pvpBitmask |= ref.get();
 		
 		if (target instanceof CreatureObject && ((CreatureObject) target).getTefTime() > 0) {
-			pvpBitmask |= PvpStatus.TEF;
+			//pvpBitmask |= PvpStatus.TEF;
 		}
 		
 		if (target.getFaction().length() > 0 && target.getFaction().equals(object.getFaction())) {