diff --git a/app/Listeners/CacheAvatarPreview.php b/app/Listeners/CacheAvatarPreview.php
index 0a80a167..89ff01a0 100644
--- a/app/Listeners/CacheAvatarPreview.php
+++ b/app/Listeners/CacheAvatarPreview.php
@@ -2,6 +2,7 @@
 
 namespace App\Listeners;
 
+use Storage;
 use App\Models\Texture;
 use App\Events\GetAvatarPreview;
 use Illuminate\Queue\InteractsWithQueue;
@@ -23,12 +24,12 @@ class CacheAvatarPreview
 
         $path = BASE_DIR."/storage/textures/$hash";
 
-        if (!\Storage::disk('cache')->has("avatar/$tid-$size")) {
+        if (!Storage::disk('cache')->has("avatar/$tid-$size")) {
             $png = \Minecraft::generateAvatarFromSkin($path, $event->size);
             imagepng($png, BASE_DIR."/storage/cache/avatar/$tid-$size");
             imagedestroy($png);
         }
 
-        return \Response::png(\Storage::disk('cache')->get("avatar/$tid-$size"));
+        return \Response::png(Storage::disk('cache')->get("avatar/$tid-$size"));
     }
 }
diff --git a/app/Listeners/CachePlayerExists.php b/app/Listeners/CachePlayerExists.php
index f5319161..99f967c2 100644
--- a/app/Listeners/CachePlayerExists.php
+++ b/app/Listeners/CachePlayerExists.php
@@ -2,6 +2,7 @@
 
 namespace App\Listeners;
 
+use Storage;
 use App\Models\PlayerModel;
 use App\Events\CheckPlayerExists;
 use Illuminate\Queue\InteractsWithQueue;
@@ -19,9 +20,9 @@ class CachePlayerExists
     {
         $player_name = $event->player_name;
 
-        if (!\Storage::disk('cache')->has("notfound/$player_name")) {
+        if ($player_name && !Storage::disk('cache')->has("notfound/$player_name")) {
             if (PlayerModel::where('player_name', $player_name)->get()->isEmpty()) {
-                \Storage::disk('cache')->put("notfound/$player_name", '');
+                Storage::disk('cache')->put("notfound/$player_name", '');
             }
         } else {
             abort(404, '角色不存在');
diff --git a/app/Listeners/CachePlayerJson.php b/app/Listeners/CachePlayerJson.php
index d1c26f03..009cc42f 100644
--- a/app/Listeners/CachePlayerJson.php
+++ b/app/Listeners/CachePlayerJson.php
@@ -26,6 +26,6 @@ class CachePlayerJson
             Storage::disk('cache')->put($filename, $player->generateJsonProfile($api_type));
         }
 
-        return \Storage::disk('cache')->get($filename);
+        return Storage::disk('cache')->get($filename);
     }
 }
diff --git a/app/Listeners/FreshNotFoundCache.php b/app/Listeners/FreshNotFoundCache.php
index b9f38feb..eade16e8 100644
--- a/app/Listeners/FreshNotFoundCache.php
+++ b/app/Listeners/FreshNotFoundCache.php
@@ -2,6 +2,7 @@
 
 namespace App\Listeners;
 
+use Storage;
 use App\Events\PlayerWasAdded;
 use Illuminate\Queue\InteractsWithQueue;
 use Illuminate\Contracts\Queue\ShouldQueue;
@@ -18,8 +19,8 @@ class FreshNotFoundCache
     {
         $player_name = $event->player->player_name;
 
-        if (\Storage::disk('cache')->has("notfound/$player_name")) {
-            \Storage::disk('cache')->delete("notfound/$player_name", '');
+        if ($player_name && Storage::disk('cache')->has("notfound/$player_name")) {
+            Storage::disk('cache')->delete("notfound/$player_name", '');
         }
     }
 }