diff --git a/.gradle/7.4.2/checksums/checksums.lock b/.gradle/7.4.2/checksums/checksums.lock deleted file mode 100644 index 30f5923..0000000 Binary files a/.gradle/7.4.2/checksums/checksums.lock and /dev/null differ diff --git a/.gradle/7.4.2/checksums/md5-checksums.bin b/.gradle/7.4.2/checksums/md5-checksums.bin deleted file mode 100644 index 87b578e..0000000 Binary files a/.gradle/7.4.2/checksums/md5-checksums.bin and /dev/null differ diff --git a/.gradle/7.4.2/checksums/sha1-checksums.bin b/.gradle/7.4.2/checksums/sha1-checksums.bin deleted file mode 100644 index d8702da..0000000 Binary files a/.gradle/7.4.2/checksums/sha1-checksums.bin and /dev/null differ diff --git a/.gradle/7.4.2/dependencies-accessors/dependencies-accessors.lock b/.gradle/7.4.2/dependencies-accessors/dependencies-accessors.lock deleted file mode 100644 index e3a3931..0000000 Binary files a/.gradle/7.4.2/dependencies-accessors/dependencies-accessors.lock and /dev/null differ diff --git a/.gradle/7.4.2/dependencies-accessors/gc.properties b/.gradle/7.4.2/dependencies-accessors/gc.properties deleted file mode 100644 index e69de29..0000000 diff --git a/.gradle/7.4.2/executionHistory/executionHistory.bin b/.gradle/7.4.2/executionHistory/executionHistory.bin deleted file mode 100644 index 7fdc0c8..0000000 Binary files a/.gradle/7.4.2/executionHistory/executionHistory.bin and /dev/null differ diff --git a/.gradle/7.4.2/executionHistory/executionHistory.lock b/.gradle/7.4.2/executionHistory/executionHistory.lock deleted file mode 100644 index d806e61..0000000 Binary files a/.gradle/7.4.2/executionHistory/executionHistory.lock and /dev/null differ diff --git a/.gradle/7.4.2/fileChanges/last-build.bin b/.gradle/7.4.2/fileChanges/last-build.bin deleted file mode 100644 index f76dd23..0000000 Binary files a/.gradle/7.4.2/fileChanges/last-build.bin and /dev/null differ diff --git a/.gradle/7.4.2/fileHashes/fileHashes.bin b/.gradle/7.4.2/fileHashes/fileHashes.bin deleted file mode 100644 index ad312cb..0000000 Binary files a/.gradle/7.4.2/fileHashes/fileHashes.bin and /dev/null differ diff --git a/.gradle/7.4.2/fileHashes/fileHashes.lock b/.gradle/7.4.2/fileHashes/fileHashes.lock deleted file mode 100644 index aed9128..0000000 Binary files a/.gradle/7.4.2/fileHashes/fileHashes.lock and /dev/null differ diff --git a/.gradle/7.4.2/gc.properties b/.gradle/7.4.2/gc.properties deleted file mode 100644 index e69de29..0000000 diff --git a/.gradle/buildOutputCleanup/buildOutputCleanup.lock b/.gradle/buildOutputCleanup/buildOutputCleanup.lock deleted file mode 100644 index 84e38a7..0000000 Binary files a/.gradle/buildOutputCleanup/buildOutputCleanup.lock and /dev/null differ diff --git a/.gradle/buildOutputCleanup/cache.properties b/.gradle/buildOutputCleanup/cache.properties deleted file mode 100644 index 7142eff..0000000 --- a/.gradle/buildOutputCleanup/cache.properties +++ /dev/null @@ -1,2 +0,0 @@ -#Tue Mar 28 00:26:24 KST 2023 -gradle.version=7.4.2 diff --git a/.gradle/buildOutputCleanup/outputFiles.bin b/.gradle/buildOutputCleanup/outputFiles.bin deleted file mode 100644 index 29d05ad..0000000 Binary files a/.gradle/buildOutputCleanup/outputFiles.bin and /dev/null differ diff --git a/.gradle/vcs-1/gc.properties b/.gradle/vcs-1/gc.properties deleted file mode 100644 index e69de29..0000000 diff --git a/build.gradle.kts b/build.gradle.kts index d288d3d..703c4d4 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -4,7 +4,7 @@ plugins { } group = "group.pvpconnect" -version = "1.0-SNAPSHOT" +version = "1.0.1" repositories { mavenCentral() diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar deleted file mode 100644 index 249e583..0000000 Binary files a/gradle/wrapper/gradle-wrapper.jar and /dev/null differ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties deleted file mode 100644 index 60c76b3..0000000 --- a/gradle/wrapper/gradle-wrapper.properties +++ /dev/null @@ -1,5 +0,0 @@ -distributionBase=GRADLE_USER_HOME -distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.4.2-bin.zip -zipStoreBase=GRADLE_USER_HOME -zipStorePath=wrapper/dists \ No newline at end of file diff --git a/gradlew b/gradlew index 1b6c787..79a61d4 100644 --- a/gradlew +++ b/gradlew @@ -55,7 +55,7 @@ # Darwin, MinGW, and NonStop. # # (3) This script is generated from the Groovy template -# https://github.com/gradle/gradle/blob/master/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt +# https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt # within the Gradle project. # # You can find Gradle at https://github.com/gradle/gradle/. @@ -80,10 +80,10 @@ do esac done -APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit - -APP_NAME="Gradle" +# This is normally unused +# shellcheck disable=SC2034 APP_BASE_NAME=${0##*/} +APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit # Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' @@ -143,12 +143,16 @@ fi if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then case $MAX_FD in #( max*) + # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked. + # shellcheck disable=SC3045 MAX_FD=$( ulimit -H -n ) || warn "Could not query maximum file descriptor limit" esac case $MAX_FD in #( '' | soft) :;; #( *) + # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked. + # shellcheck disable=SC3045 ulimit -n "$MAX_FD" || warn "Could not set maximum file descriptor limit to $MAX_FD" esac @@ -205,6 +209,12 @@ set -- \ org.gradle.wrapper.GradleWrapperMain \ "$@" +# Stop when "xargs" is not available. +if ! command -v xargs >/dev/null 2>&1 +then + die "xargs is not available" +fi + # Use "xargs" to parse quoted args. # # With -n1 it outputs one arg per line, with the quotes and backslashes removed. diff --git a/gradlew.bat b/gradlew.bat index 107acd3..93e3f59 100644 --- a/gradlew.bat +++ b/gradlew.bat @@ -14,7 +14,7 @@ @rem limitations under the License. @rem -@if "%DEBUG%" == "" @echo off +@if "%DEBUG%"=="" @echo off @rem ########################################################################## @rem @rem Gradle startup script for Windows @@ -25,7 +25,8 @@ if "%OS%"=="Windows_NT" setlocal set DIRNAME=%~dp0 -if "%DIRNAME%" == "" set DIRNAME=. +if "%DIRNAME%"=="" set DIRNAME=. +@rem This is normally unused set APP_BASE_NAME=%~n0 set APP_HOME=%DIRNAME% @@ -40,7 +41,7 @@ if defined JAVA_HOME goto findJavaFromJavaHome set JAVA_EXE=java.exe %JAVA_EXE% -version >NUL 2>&1 -if "%ERRORLEVEL%" == "0" goto execute +if %ERRORLEVEL% equ 0 goto execute echo. echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. @@ -75,13 +76,15 @@ set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar :end @rem End local scope for the variables with windows NT shell -if "%ERRORLEVEL%"=="0" goto mainEnd +if %ERRORLEVEL% equ 0 goto mainEnd :fail rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of rem the _cmd.exe /c_ return code! -if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1 -exit /b 1 +set EXIT_CODE=%ERRORLEVEL% +if %EXIT_CODE% equ 0 set EXIT_CODE=1 +if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE% +exit /b %EXIT_CODE% :mainEnd if "%OS%"=="Windows_NT" endlocal diff --git a/src/main/kotlin/group/pvpconnect/combat_f/cmd/CombatCmd.kt b/src/main/kotlin/group/pvpconnect/combat_f/cmd/CombatCmd.kt index 62732ce..9dc3bec 100644 --- a/src/main/kotlin/group/pvpconnect/combat_f/cmd/CombatCmd.kt +++ b/src/main/kotlin/group/pvpconnect/combat_f/cmd/CombatCmd.kt @@ -3,6 +3,7 @@ package group.pvpconnect.combat_f.cmd import group.pvpconnect.combat_f.data.CombatData import io.github.monun.kommand.getValue import io.github.monun.kommand.kommand +import org.bukkit.Bukkit import org.bukkit.ChatColor import org.bukkit.World import org.bukkit.plugin.Plugin @@ -29,6 +30,16 @@ class CombatCmd(plugin:Plugin, val cd:CombatData) { val world:World by it val bool = cd.instance.getCanSeeWorld(world.name) cd.instance.setCanSeeWorld(world.name,!bool) + if(!bool){ + Bukkit.getOnlinePlayers().forEach{ pl1 -> + Bukkit.getOnlinePlayers().forEach { pl2 -> + if(pl1.world.name == world.name || pl2.world.name == world.name){ + pl1.showPlayer(plugin,pl2) + pl2.showPlayer(plugin,pl1) + } + } + } + } sender.sendMessage("${ChatColor.BOLD}${ChatColor.GOLD}[${ChatColor.GREEN}✓${ChatColor.GOLD}] ${ChatColor.WHITE}${world.name}의 컴뱃중 다른 사람 볼수있음이 ${if(!bool)"활성화 되었습니다!" else "비활성화 되었습니다!"}") } } diff --git a/src/main/kotlin/group/pvpconnect/combat_f/event/CombatEvent.kt b/src/main/kotlin/group/pvpconnect/combat_f/event/CombatEvent.kt index 7a9d476..c47c1b5 100644 --- a/src/main/kotlin/group/pvpconnect/combat_f/event/CombatEvent.kt +++ b/src/main/kotlin/group/pvpconnect/combat_f/event/CombatEvent.kt @@ -40,8 +40,6 @@ class CombatEvent(private val plugin:Main, private val combatData: CombatData):L if(it.uniqueId == e.damager.uniqueId || it.uniqueId == e.entity.uniqueId){ return@forEach } - it.hidePlayer(plugin,e.damager as Player) - it.hidePlayer(plugin,e.entity as Player) (e.damager as Player).hidePlayer(plugin,it) (e.entity as Player).hidePlayer(plugin,it) } @@ -74,8 +72,6 @@ class CombatEvent(private val plugin:Main, private val combatData: CombatData):L if(it.uniqueId == shooter.uniqueId || it.uniqueId == player.uniqueId){ return@forEach } - it.hidePlayer(plugin,shooter) - it.hidePlayer(plugin,player) shooter.hidePlayer(plugin,it) player.hidePlayer(plugin,it) } @@ -86,7 +82,7 @@ class CombatEvent(private val plugin:Main, private val combatData: CombatData):L @EventHandler fun onCommand(e:PlayerCommandPreprocessEvent){ - if(listOf("l","lobby","home","spawn").any { e.message == it }){ + if(listOf("/l","/lobby","/home","/spawn").any { e.message == it }){ val list = plugin.instance.list[e.player.uniqueId] ?: return if(!list.first) return e.isCancelled = true @@ -101,8 +97,7 @@ class CombatEvent(private val plugin:Main, private val combatData: CombatData):L e.player.health = 0.0 if(combatData.instance.getCanSeeWorld(e.player.world.name)){ Bukkit.getOnlinePlayers().forEach{ - it.showPlayer(plugin,e.player) - it.showPlayer(plugin,e.player.killer!!) + if(it.uniqueId == e.player.uniqueId || it.uniqueId == e.player.killer!!.uniqueId) return@forEach e.player.showPlayer(plugin,it) e.player.killer!!.showPlayer(plugin,it) } @@ -117,8 +112,7 @@ class CombatEvent(private val plugin:Main, private val combatData: CombatData):L if(!list.first) return if(combatData.instance.getCanSeeWorld(e.player.world.name)){ Bukkit.getOnlinePlayers().forEach{ - it.showPlayer(plugin,e.player) - it.showPlayer(plugin,e.player.killer!!) + if(it.uniqueId == e.player.uniqueId || it.uniqueId == e.player.killer!!.uniqueId) return@forEach e.player.showPlayer(plugin,it) e.player.killer!!.showPlayer(plugin,it) } diff --git a/src/main/resources/plugin.yml b/src/main/resources/plugin.yml index 3b994f6..0e9ae11 100644 --- a/src/main/resources/plugin.yml +++ b/src/main/resources/plugin.yml @@ -1,5 +1,5 @@ name: Combat -version: 1.0-SNAPSHOT +version: 1.0.1 main: group.pvpconnect.combat_f.Main api-version: 1.19 author: faiz