Merge pull request #648 from book000/feat/add-protect-old-worlds

feat: 保護ワールドにJao_Afa_3などを追加
jaoafa · Jan 22, 2022 · f1de303 · f1de303
2 parents 4ef6bc9 + 3e28823
commit f1de303
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 8 deletions.
diff --git a/src/main/java/com/jaoafa/mymaid4/event/Event_PlayerCheckPreLogin.java b/src/main/java/com/jaoafa/mymaid4/event/Event_PlayerCheckPreLogin.java
@@ -1,7 +1,7 @@
 /*
  * jaoLicense
  *
- * Copyright (c) 2021 jao Minecraft Server
+ * Copyright (c) 2022 jao Minecraft Server
  *
  * The following license applies to this project: jaoLicense
  *
@@ -176,7 +176,7 @@ private static void disallow(AsyncPlayerPreLoginEvent event, Component message,
         event.disallow(Result.KICK_FULL, component);
         if (MyMaidData.getJaotanChannel() == null) return;
         MyMaidData.getJaotanChannel().sendMessage(
-            "[MyMaid3-PreLoginCheck] " + event.getName() + " -> `" + reason + "`").queue();
+            "[MyMaid4-PreLoginCheck] " + event.getName() + " -> `" + reason + "`").queue();
     }
 
     private static void disallow(AsyncPlayerPreLoginEvent event, Component message, String reason, String data) {
@@ -190,6 +190,6 @@ private static void disallow(AsyncPlayerPreLoginEvent event, Component message,
         event.disallow(Result.KICK_FULL, component);
         if (MyMaidData.getJaotanChannel() == null) return;
         MyMaidData.getJaotanChannel().sendMessage(
-            "[MyMaid3-PreLoginCheck] " + event.getName() + " -> `" + reason + " (" + data + ")`").queue();
+            "[MyMaid4-PreLoginCheck] " + event.getName() + " -> `" + reason + " (" + data + ")`").queue();
     }
 }
diff --git a/src/main/java/com/jaoafa/mymaid4/event/Event_ProtectionOldWorlds.java b/src/main/java/com/jaoafa/mymaid4/event/Event_ProtectionOldWorlds.java
@@ -1,7 +1,7 @@
 /*
  * jaoLicense
  *
- * Copyright (c) 2021 jao Minecraft Server
+ * Copyright (c) 2022 jao Minecraft Server
  *
  * The following license applies to this project: jaoLicense
  *
@@ -37,13 +37,17 @@ public class Event_ProtectionOldWorlds extends MyMaidLibrary implements Listener
         "kassi-hp-tk",
         "Jao_Afa_1",
         "Jao_Afa_2",
+        "Jao_Afa_3",
+        "Jao_Afa_nether_1",
+        "Jao_Afa_nether_2",
         "SandBox_1",
         "SandBox_2",
         "SandBox_3",
         "ReJao_Afa",
         "Summer2017",
         "Summer2018",
-        "Summer2020"
+        "Summer2020",
+        "jaoTest1.18.1"
     };
     final Material[] ignoreClickCancel = new Material[]{};
     final Material[] ignoreTargetClickCancel = new Material[]{
@@ -238,7 +242,7 @@ public void onPlayerInteractEvent(PlayerInteractEvent event) {
         player.sendMessage(Component.text().append(
             Component.text("[OldWorldProtection-DEBUG]"),
             Component.space(),
-            Component.text(String.format("MyMaid3 Version: %s", Main.getMain().getDescription().getVersion()), NamedTextColor.GREEN)
+            Component.text(String.format("MyMaid4 Version: %s", Main.getMain().getDescription().getVersion()), NamedTextColor.GREEN)
         ));
 
         if (isA(player)) {

diff --git a/src/main/java/com/jaoafa/mymaid4/event/Event_Vote.java b/src/main/java/com/jaoafa/mymaid4/event/Event_Vote.java
@@ -1,7 +1,7 @@
 /*
  * jaoLicense
  *
- * Copyright (c) 2021 jao Minecraft Server
+ * Copyright (c) 2022 jao Minecraft Server
  *
  * The following license applies to this project: jaoLicense
  *
@@ -118,7 +118,7 @@ public void onVotifierEvent(VotifierEvent event) {
         Vote vote = event.getVote();
         String name = vote.getUsername();
         String service = vote.getServiceName();
-        System.out.println("onVotifierEvent[MyMaid3]: " + vote.getUsername() + " " + vote.getAddress() + " "
+        System.out.println("onVotifierEvent[MyMaid4]: " + vote.getUsername() + " " + vote.getAddress() + " "
             + vote.getServiceName() + " " + vote.getTimeStamp());
         new BukkitRunnable() {
             public void run() {