From 1b01ee1247ce65e1edcc8f2b8c88091989b4a3e5 Mon Sep 17 00:00:00 2001 From: BuildTools Date: Wed, 21 Apr 2021 13:10:39 +0900 Subject: [PATCH 1/8] =?UTF-8?q?sh=20->=20bash=EB=A1=9C=20=EB=B3=80?= =?UTF-8?q?=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- server.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/server.sh b/server.sh index 9fd5313..06c7567 100644 --- a/server.sh +++ b/server.sh @@ -1,4 +1,4 @@ -#!/bin/sh +#!/bin/bash ./gradlew clean copyToServer From 83001c14287d5c03f522685c1204cfe7c6464661 Mon Sep 17 00:00:00 2001 From: BuildTools Date: Wed, 21 Apr 2021 13:10:59 +0900 Subject: [PATCH 2/8] =?UTF-8?q?=EA=B3=A0=EC=88=98=20=EB=B0=B4=20=EA=B8=B0?= =?UTF-8?q?=EB=8A=A5=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/github/monun/survival/Whitelist.kt | 3 +++ .../kotlin/com/github/monun/survival/gosuBan.kt | 16 ++++++++++++++++ .../monun/survival/plugin/EventListener.kt | 9 +++++---- 3 files changed, 24 insertions(+), 4 deletions(-) create mode 100644 src/main/kotlin/com/github/monun/survival/gosuBan.kt diff --git a/src/main/kotlin/com/github/monun/survival/Whitelist.kt b/src/main/kotlin/com/github/monun/survival/Whitelist.kt index 5beea81..a67242a 100644 --- a/src/main/kotlin/com/github/monun/survival/Whitelist.kt +++ b/src/main/kotlin/com/github/monun/survival/Whitelist.kt @@ -6,6 +6,7 @@ import java.io.File object Whitelist { lateinit var allows: Set + fun load(file: File) { if (!file.exists()) { file.createNewFile() @@ -14,4 +15,6 @@ object Whitelist { val lines = file.readLines() allows = ImmutableSortedSet.copyOf(String.CASE_INSENSITIVE_ORDER, lines) } + + } \ No newline at end of file diff --git a/src/main/kotlin/com/github/monun/survival/gosuBan.kt b/src/main/kotlin/com/github/monun/survival/gosuBan.kt new file mode 100644 index 0000000..29afc08 --- /dev/null +++ b/src/main/kotlin/com/github/monun/survival/gosuBan.kt @@ -0,0 +1,16 @@ +package com.github.monun.survival + +import com.google.common.collect.ImmutableSortedSet +import java.io.File + +object gosuBan { + lateinit var denied: Set + + fun ban(file: File) { + if(!file.exists()) { + file.createNewFile() + } + val lines = file.readLines() + denied = ImmutableSortedSet.copyOf(String.CASE_INSENSITIVE_ORDER, lines) + } +} \ No newline at end of file diff --git a/src/main/kotlin/com/github/monun/survival/plugin/EventListener.kt b/src/main/kotlin/com/github/monun/survival/plugin/EventListener.kt index fafa40e..00a23b5 100644 --- a/src/main/kotlin/com/github/monun/survival/plugin/EventListener.kt +++ b/src/main/kotlin/com/github/monun/survival/plugin/EventListener.kt @@ -2,10 +2,7 @@ package com.github.monun.survival.plugin import com.destroystokyo.paper.event.entity.PlayerNaturallySpawnCreaturesEvent import com.destroystokyo.paper.event.server.PaperServerListPingEvent -import com.github.monun.survival.Survival -import com.github.monun.survival.SurvivalConfig -import com.github.monun.survival.Whitelist -import com.github.monun.survival.survival +import com.github.monun.survival.* import io.papermc.paper.event.player.AsyncChatEvent import net.kyori.adventure.text.Component import net.kyori.adventure.text.format.TextColor @@ -37,6 +34,10 @@ class EventListener( val name = event.name if (name in SurvivalConfig.defaultHumans || name in Whitelist.allows) return event.disallow(AsyncPlayerPreLoginEvent.Result.KICK_OTHER, Component.text("다음 기회에 ㅜㅜ")) + //고수 밴 기능 추가 + if (name in SurvivalConfig.defaultHumans || name in gosuBan.denied) return + event.disallow(AsyncPlayerPreLoginEvent.Result.KICK_OTHER, Component.text("고수 밴")) + } @EventHandler(priority = EventPriority.LOWEST) From 9c4691e759e4b9db595fb07cf54fafaba464c5d2 Mon Sep 17 00:00:00 2001 From: BuildTools Date: Wed, 21 Apr 2021 13:20:04 +0900 Subject: [PATCH 3/8] =?UTF-8?q?=EA=B3=A0=EC=88=98=20=EB=B0=B4=20=EA=B8=B0?= =?UTF-8?q?=EB=8A=A5=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../kotlin/com/github/monun/survival/plugin/SurvivalPlugin.kt | 1 + 1 file changed, 1 insertion(+) diff --git a/src/main/kotlin/com/github/monun/survival/plugin/SurvivalPlugin.kt b/src/main/kotlin/com/github/monun/survival/plugin/SurvivalPlugin.kt index 5c09995..be41e19 100644 --- a/src/main/kotlin/com/github/monun/survival/plugin/SurvivalPlugin.kt +++ b/src/main/kotlin/com/github/monun/survival/plugin/SurvivalPlugin.kt @@ -33,6 +33,7 @@ class SurvivalPlugin : JavaPlugin() { val configFile = File(dataFolder, "config.yml") SurvivalConfig.load(configFile) Whitelist.load(File(dataFolder, "whitelist.txt")) + gosuBan.ban(File(dataFolder, "ban.txt")) setupRecipe() setupCommands() From 9f46b139f5dda1dbe64678b87b5cb1b4ac280d19 Mon Sep 17 00:00:00 2001 From: BuildTools Date: Wed, 21 Apr 2021 13:25:30 +0900 Subject: [PATCH 4/8] =?UTF-8?q?=EA=B3=A0=EC=88=98=20=EB=B0=B4=20=EA=B8=B0?= =?UTF-8?q?=EB=8A=A5=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../kotlin/com/github/monun/survival/plugin/EventListener.kt | 2 +- .../kotlin/com/github/monun/survival/plugin/SurvivalPlugin.kt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/kotlin/com/github/monun/survival/plugin/EventListener.kt b/src/main/kotlin/com/github/monun/survival/plugin/EventListener.kt index 00a23b5..4e5be51 100644 --- a/src/main/kotlin/com/github/monun/survival/plugin/EventListener.kt +++ b/src/main/kotlin/com/github/monun/survival/plugin/EventListener.kt @@ -35,7 +35,7 @@ class EventListener( if (name in SurvivalConfig.defaultHumans || name in Whitelist.allows) return event.disallow(AsyncPlayerPreLoginEvent.Result.KICK_OTHER, Component.text("다음 기회에 ㅜㅜ")) //고수 밴 기능 추가 - if (name in SurvivalConfig.defaultHumans || name in gosuBan.denied) return + if (name in SurvivalConfig.defaultHumans || name in Gosuban.denied) return event.disallow(AsyncPlayerPreLoginEvent.Result.KICK_OTHER, Component.text("고수 밴")) } diff --git a/src/main/kotlin/com/github/monun/survival/plugin/SurvivalPlugin.kt b/src/main/kotlin/com/github/monun/survival/plugin/SurvivalPlugin.kt index be41e19..69351d3 100644 --- a/src/main/kotlin/com/github/monun/survival/plugin/SurvivalPlugin.kt +++ b/src/main/kotlin/com/github/monun/survival/plugin/SurvivalPlugin.kt @@ -33,7 +33,7 @@ class SurvivalPlugin : JavaPlugin() { val configFile = File(dataFolder, "config.yml") SurvivalConfig.load(configFile) Whitelist.load(File(dataFolder, "whitelist.txt")) - gosuBan.ban(File(dataFolder, "ban.txt")) + Gosuban.ban(File(dataFolder, "Gosuban.txt")) setupRecipe() setupCommands() From 8e96a7fe520c2bd67534e77ebda08c4b063a8f5b Mon Sep 17 00:00:00 2001 From: BuildTools Date: Wed, 21 Apr 2021 13:30:29 +0900 Subject: [PATCH 5/8] =?UTF-8?q?=EA=B3=A0=EC=88=98=20=EB=B0=B4=20=EA=B8=B0?= =?UTF-8?q?=EB=8A=A5=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/kotlin/com/github/monun/survival/gosuBan.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/kotlin/com/github/monun/survival/gosuBan.kt b/src/main/kotlin/com/github/monun/survival/gosuBan.kt index 29afc08..ca9b3a6 100644 --- a/src/main/kotlin/com/github/monun/survival/gosuBan.kt +++ b/src/main/kotlin/com/github/monun/survival/gosuBan.kt @@ -3,7 +3,7 @@ package com.github.monun.survival import com.google.common.collect.ImmutableSortedSet import java.io.File -object gosuBan { +object Gosuban { lateinit var denied: Set fun ban(file: File) { From dcc96d877af24054880aa3dfe657fc9f062e1e49 Mon Sep 17 00:00:00 2001 From: BuildTools Date: Wed, 21 Apr 2021 14:08:09 +0900 Subject: [PATCH 6/8] =?UTF-8?q?=EB=9E=9C=EB=8D=A4=ED=95=A8=EC=88=98=20?= =?UTF-8?q?=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../kotlin/com/github/monun/survival/plugin/SurvivalPlugin.kt | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/main/kotlin/com/github/monun/survival/plugin/SurvivalPlugin.kt b/src/main/kotlin/com/github/monun/survival/plugin/SurvivalPlugin.kt index 69351d3..f184248 100644 --- a/src/main/kotlin/com/github/monun/survival/plugin/SurvivalPlugin.kt +++ b/src/main/kotlin/com/github/monun/survival/plugin/SurvivalPlugin.kt @@ -136,8 +136,7 @@ class SurvivalPlugin : JavaPlugin() { isInvulnerable = true setGravity(false) } - - if (nextInt(2) == 0) { + if (nextInt(10) <= 5) { world.dropItem(loc, ItemStack(Material.NETHER_STAR)) } else { world.spawn(loc.apply { y -= 0.25 }, ArmorStand::class.java).apply { From 0fb71e67f47e2e5bb770cf1be1925715a25b0448 Mon Sep 17 00:00:00 2001 From: BuildTools Date: Wed, 21 Apr 2021 14:18:22 +0900 Subject: [PATCH 7/8] =?UTF-8?q?=E2=9C=85=EA=B3=A0=EC=88=98=20=EB=B0=B4=20?= =?UTF-8?q?=EB=B2=84=EA=B7=B8=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/github/monun/survival/plugin/EventListener.kt | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/src/main/kotlin/com/github/monun/survival/plugin/EventListener.kt b/src/main/kotlin/com/github/monun/survival/plugin/EventListener.kt index 4e5be51..867f49a 100644 --- a/src/main/kotlin/com/github/monun/survival/plugin/EventListener.kt +++ b/src/main/kotlin/com/github/monun/survival/plugin/EventListener.kt @@ -32,12 +32,11 @@ class EventListener( @EventHandler fun onAsyncPlayerPreLogin(event: AsyncPlayerPreLoginEvent) { val name = event.name - if (name in SurvivalConfig.defaultHumans || name in Whitelist.allows) return - event.disallow(AsyncPlayerPreLoginEvent.Result.KICK_OTHER, Component.text("다음 기회에 ㅜㅜ")) - //고수 밴 기능 추가 - if (name in SurvivalConfig.defaultHumans || name in Gosuban.denied) return - event.disallow(AsyncPlayerPreLoginEvent.Result.KICK_OTHER, Component.text("고수 밴")) - + if (name in SurvivalConfig.defaultHumans || name in Whitelist.allows){ + return event.disallow(AsyncPlayerPreLoginEvent.Result.KICK_OTHER, Component.text("다음 기회에 ㅜㅜ")) + } else if (name in SurvivalConfig.defaultHumans || name in Gosuban.denied) { + return event.disallow(AsyncPlayerPreLoginEvent.Result.KICK_OTHER, Component.text("고수 밴")) + } } @EventHandler(priority = EventPriority.LOWEST) From 05a987a1be04f2a06a5b6a603174bc93564043b5 Mon Sep 17 00:00:00 2001 From: BuildTools Date: Wed, 21 Apr 2021 15:45:47 +0900 Subject: [PATCH 8/8] =?UTF-8?q?=EA=B3=A0=EC=88=98=20=EB=B0=B4=20=EA=B8=B0?= =?UTF-8?q?=EB=8A=A5=20=EB=B2=84=EA=B7=B8=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/github/monun/survival/plugin/EventListener.kt | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/src/main/kotlin/com/github/monun/survival/plugin/EventListener.kt b/src/main/kotlin/com/github/monun/survival/plugin/EventListener.kt index 867f49a..eae6855 100644 --- a/src/main/kotlin/com/github/monun/survival/plugin/EventListener.kt +++ b/src/main/kotlin/com/github/monun/survival/plugin/EventListener.kt @@ -32,11 +32,10 @@ class EventListener( @EventHandler fun onAsyncPlayerPreLogin(event: AsyncPlayerPreLoginEvent) { val name = event.name - if (name in SurvivalConfig.defaultHumans || name in Whitelist.allows){ - return event.disallow(AsyncPlayerPreLoginEvent.Result.KICK_OTHER, Component.text("다음 기회에 ㅜㅜ")) - } else if (name in SurvivalConfig.defaultHumans || name in Gosuban.denied) { - return event.disallow(AsyncPlayerPreLoginEvent.Result.KICK_OTHER, Component.text("고수 밴")) - } + if (name in SurvivalConfig.defaultHumans || name in Whitelist.allows) return + event.disallow(AsyncPlayerPreLoginEvent.Result.KICK_OTHER, Component.text("다음 기회에 ㅜㅜ")) + if (name !in Gosuban.denied) return + event.disallow(AsyncPlayerPreLoginEvent.Result.KICK_OTHER, Component.text("고수 밴")) } @EventHandler(priority = EventPriority.LOWEST)