X-Git-Url: https://ruin.nu/git/?a=blobdiff_plain;f=lib%2FNDWeb%2FController%2FRoot.pm;h=5faa024d2567b5c72c0c55aa82262dfd69d367ee;hb=39308b229f28f289606694803fffe83a64c0c91d;hp=29a0cbcb1a665a029c2709cbc07d84609eedf465;hpb=fad7141dbbfb2d235f8cadd98d96cbed9b7c4be6;p=ndwebbie.git

diff --git a/lib/NDWeb/Controller/Root.pm b/lib/NDWeb/Controller/Root.pm
index 29a0cbc..5faa024 100644
--- a/lib/NDWeb/Controller/Root.pm
+++ b/lib/NDWeb/Controller/Root.pm
@@ -129,8 +129,8 @@ sub listTargets : Private {
 
 	my $dbh = $c ->model;
 
-	my $query = $dbh->prepare(q{SELECT t.id, r.id AS raid, r.tick+c.wave-1 AS landingtick, 
-		(released_coords AND old_claim(timestamp)) AS released_coords, coords(x,y,z),c.launched,c.wave,c.joinable
+	my $query = $dbh->prepare(q{SELECT t.id, r.id AS raid, r.tick+c.wave-1 AS landingtick,
+		released_coords, coords(x,y,z),c.launched,c.wave,c.joinable
 FROM raid_claims c
 	JOIN raid_targets t ON c.target = t.id
 	JOIN raids r ON t.raid = r.id
@@ -243,10 +243,7 @@ AND mission = 'Full fleet' AND name IN ('Main','Advanced Unit');
 			newposts => $newposts,
 			unreadposts => $unread
 		});
-		$c->stash->{user}->{attacker} = $c->check_user_roles(qw/attack_menu/)
-			&& (!$c->check_user_roles(qw/member_menu/)
-				|| ($c->user->planet && (($c->stash->{TICK} - $fleetupdate < 24)
-					|| $c->check_user_roles(qw/no_fleet_update/)))),
+		$c->stash->{user}->{attacker} = $c->check_user_roles(qw/attack_menu/);
 		$c->forward('listTargets');
 	}
 	my $birthdays = $dbh->prepare(q{SELECT username