X-Git-Url: https://git.localhorst.tv/?a=blobdiff_plain;ds=sidebyside;f=app%2FModels%2FUser.php;h=eea1426d8fcc7c592aca5592b5a2ef70f7765253;hb=ce0c2752445b1d0960e331a335f56001f3c521c6;hp=b4950c306c458fc5973f2a899f7021f93603f53d;hpb=2ab05ab7927e8b21887ffa42d04eb9d4ff899382;p=alttp.git

diff --git a/app/Models/User.php b/app/Models/User.php
index b4950c3..eea1426 100644
--- a/app/Models/User.php
+++ b/app/Models/User.php
@@ -59,37 +59,46 @@ class User extends Authenticatable
 
 	public function round_first() {
 		return $this->rounds()
-			->whereNot('locked')
+			->where('locked', true)
+			->where('no_record', false)
+			->wherePivot('forfeit', false)
 			->wherePivot('placement', 1);
 	}
 
 	public function round_second() {
 		return $this->rounds()
-			->whereNot('locked')
+			->where('locked', true)
+			->where('no_record', false)
+			->wherePivot('forfeit', false)
 			->wherePivot('placement', 2);
 	}
 
 	public function round_third() {
 		return $this->rounds()
-			->whereNot('locked')
+			->where('locked', true)
+			->where('no_record', false)
+			->wherePivot('forfeit', false)
 			->wherePivot('placement', 3);
 	}
 
 	public function tournament_first() {
 		return $this->tournaments()
-			->whereNot('locked')
+			->where('locked', true)
+			->where('no_record', false)
 			->wherePivot('placement', 1);
 	}
 
 	public function tournament_second() {
 		return $this->tournaments()
-			->whereNot('locked')
+			->where('locked', true)
+			->where('no_record', false)
 			->wherePivot('placement', 2);
 	}
 
 	public function tournament_third() {
 		return $this->tournaments()
-			->whereNot('locked')
+			->where('locked', true)
+			->where('no_record', false)
 			->wherePivot('placement', 3);
 	}