✨버그 수정 / 버전 업
This commit is contained in:
parent
7fb3f1fad0
commit
a86571b435
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
@ -1,2 +0,0 @@
|
|||||||
#Tue Mar 28 00:26:24 KST 2023
|
|
||||||
gradle.version=7.4.2
|
|
Binary file not shown.
@ -4,7 +4,7 @@ plugins {
|
|||||||
}
|
}
|
||||||
|
|
||||||
group = "group.pvpconnect"
|
group = "group.pvpconnect"
|
||||||
version = "1.0-SNAPSHOT"
|
version = "1.0.1"
|
||||||
|
|
||||||
repositories {
|
repositories {
|
||||||
mavenCentral()
|
mavenCentral()
|
||||||
|
BIN
gradle/wrapper/gradle-wrapper.jar
vendored
BIN
gradle/wrapper/gradle-wrapper.jar
vendored
Binary file not shown.
5
gradle/wrapper/gradle-wrapper.properties
vendored
5
gradle/wrapper/gradle-wrapper.properties
vendored
@ -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
|
|
18
gradlew
vendored
18
gradlew
vendored
@ -55,7 +55,7 @@
|
|||||||
# Darwin, MinGW, and NonStop.
|
# Darwin, MinGW, and NonStop.
|
||||||
#
|
#
|
||||||
# (3) This script is generated from the Groovy template
|
# (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.
|
# within the Gradle project.
|
||||||
#
|
#
|
||||||
# You can find Gradle at https://github.com/gradle/gradle/.
|
# You can find Gradle at https://github.com/gradle/gradle/.
|
||||||
@ -80,10 +80,10 @@ do
|
|||||||
esac
|
esac
|
||||||
done
|
done
|
||||||
|
|
||||||
APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
|
# This is normally unused
|
||||||
|
# shellcheck disable=SC2034
|
||||||
APP_NAME="Gradle"
|
|
||||||
APP_BASE_NAME=${0##*/}
|
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.
|
# 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"'
|
DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
|
||||||
@ -143,12 +143,16 @@ fi
|
|||||||
if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
|
if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
|
||||||
case $MAX_FD in #(
|
case $MAX_FD in #(
|
||||||
max*)
|
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 ) ||
|
MAX_FD=$( ulimit -H -n ) ||
|
||||||
warn "Could not query maximum file descriptor limit"
|
warn "Could not query maximum file descriptor limit"
|
||||||
esac
|
esac
|
||||||
case $MAX_FD in #(
|
case $MAX_FD in #(
|
||||||
'' | soft) :;; #(
|
'' | 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" ||
|
ulimit -n "$MAX_FD" ||
|
||||||
warn "Could not set maximum file descriptor limit to $MAX_FD"
|
warn "Could not set maximum file descriptor limit to $MAX_FD"
|
||||||
esac
|
esac
|
||||||
@ -205,6 +209,12 @@ set -- \
|
|||||||
org.gradle.wrapper.GradleWrapperMain \
|
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.
|
# Use "xargs" to parse quoted args.
|
||||||
#
|
#
|
||||||
# With -n1 it outputs one arg per line, with the quotes and backslashes removed.
|
# With -n1 it outputs one arg per line, with the quotes and backslashes removed.
|
||||||
|
11
gradlew.bat
vendored
11
gradlew.bat
vendored
@ -26,6 +26,7 @@ if "%OS%"=="Windows_NT" setlocal
|
|||||||
|
|
||||||
set DIRNAME=%~dp0
|
set DIRNAME=%~dp0
|
||||||
if "%DIRNAME%"=="" set DIRNAME=.
|
if "%DIRNAME%"=="" set DIRNAME=.
|
||||||
|
@rem This is normally unused
|
||||||
set APP_BASE_NAME=%~n0
|
set APP_BASE_NAME=%~n0
|
||||||
set APP_HOME=%DIRNAME%
|
set APP_HOME=%DIRNAME%
|
||||||
|
|
||||||
@ -40,7 +41,7 @@ if defined JAVA_HOME goto findJavaFromJavaHome
|
|||||||
|
|
||||||
set JAVA_EXE=java.exe
|
set JAVA_EXE=java.exe
|
||||||
%JAVA_EXE% -version >NUL 2>&1
|
%JAVA_EXE% -version >NUL 2>&1
|
||||||
if "%ERRORLEVEL%" == "0" goto execute
|
if %ERRORLEVEL% equ 0 goto execute
|
||||||
|
|
||||||
echo.
|
echo.
|
||||||
echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
|
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
|
:end
|
||||||
@rem End local scope for the variables with windows NT shell
|
@rem End local scope for the variables with windows NT shell
|
||||||
if "%ERRORLEVEL%"=="0" goto mainEnd
|
if %ERRORLEVEL% equ 0 goto mainEnd
|
||||||
|
|
||||||
:fail
|
:fail
|
||||||
rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
|
rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
|
||||||
rem the _cmd.exe /c_ return code!
|
rem the _cmd.exe /c_ return code!
|
||||||
if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
|
set EXIT_CODE=%ERRORLEVEL%
|
||||||
exit /b 1
|
if %EXIT_CODE% equ 0 set EXIT_CODE=1
|
||||||
|
if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE%
|
||||||
|
exit /b %EXIT_CODE%
|
||||||
|
|
||||||
:mainEnd
|
:mainEnd
|
||||||
if "%OS%"=="Windows_NT" endlocal
|
if "%OS%"=="Windows_NT" endlocal
|
||||||
|
@ -3,6 +3,7 @@ package group.pvpconnect.combat_f.cmd
|
|||||||
import group.pvpconnect.combat_f.data.CombatData
|
import group.pvpconnect.combat_f.data.CombatData
|
||||||
import io.github.monun.kommand.getValue
|
import io.github.monun.kommand.getValue
|
||||||
import io.github.monun.kommand.kommand
|
import io.github.monun.kommand.kommand
|
||||||
|
import org.bukkit.Bukkit
|
||||||
import org.bukkit.ChatColor
|
import org.bukkit.ChatColor
|
||||||
import org.bukkit.World
|
import org.bukkit.World
|
||||||
import org.bukkit.plugin.Plugin
|
import org.bukkit.plugin.Plugin
|
||||||
@ -29,6 +30,16 @@ class CombatCmd(plugin:Plugin, val cd:CombatData) {
|
|||||||
val world:World by it
|
val world:World by it
|
||||||
val bool = cd.instance.getCanSeeWorld(world.name)
|
val bool = cd.instance.getCanSeeWorld(world.name)
|
||||||
cd.instance.setCanSeeWorld(world.name,!bool)
|
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 "비활성화 되었습니다!"}")
|
sender.sendMessage("${ChatColor.BOLD}${ChatColor.GOLD}[${ChatColor.GREEN}✓${ChatColor.GOLD}] ${ChatColor.WHITE}${world.name}의 컴뱃중 다른 사람 볼수있음이 ${if(!bool)"활성화 되었습니다!" else "비활성화 되었습니다!"}")
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -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){
|
if(it.uniqueId == e.damager.uniqueId || it.uniqueId == e.entity.uniqueId){
|
||||||
return@forEach
|
return@forEach
|
||||||
}
|
}
|
||||||
it.hidePlayer(plugin,e.damager as Player)
|
|
||||||
it.hidePlayer(plugin,e.entity as Player)
|
|
||||||
(e.damager as Player).hidePlayer(plugin,it)
|
(e.damager as Player).hidePlayer(plugin,it)
|
||||||
(e.entity 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){
|
if(it.uniqueId == shooter.uniqueId || it.uniqueId == player.uniqueId){
|
||||||
return@forEach
|
return@forEach
|
||||||
}
|
}
|
||||||
it.hidePlayer(plugin,shooter)
|
|
||||||
it.hidePlayer(plugin,player)
|
|
||||||
shooter.hidePlayer(plugin,it)
|
shooter.hidePlayer(plugin,it)
|
||||||
player.hidePlayer(plugin,it)
|
player.hidePlayer(plugin,it)
|
||||||
}
|
}
|
||||||
@ -86,7 +82,7 @@ class CombatEvent(private val plugin:Main, private val combatData: CombatData):L
|
|||||||
|
|
||||||
@EventHandler
|
@EventHandler
|
||||||
fun onCommand(e:PlayerCommandPreprocessEvent){
|
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
|
val list = plugin.instance.list[e.player.uniqueId] ?: return
|
||||||
if(!list.first) return
|
if(!list.first) return
|
||||||
e.isCancelled = true
|
e.isCancelled = true
|
||||||
@ -101,8 +97,7 @@ class CombatEvent(private val plugin:Main, private val combatData: CombatData):L
|
|||||||
e.player.health = 0.0
|
e.player.health = 0.0
|
||||||
if(combatData.instance.getCanSeeWorld(e.player.world.name)){
|
if(combatData.instance.getCanSeeWorld(e.player.world.name)){
|
||||||
Bukkit.getOnlinePlayers().forEach{
|
Bukkit.getOnlinePlayers().forEach{
|
||||||
it.showPlayer(plugin,e.player)
|
if(it.uniqueId == e.player.uniqueId || it.uniqueId == e.player.killer!!.uniqueId) return@forEach
|
||||||
it.showPlayer(plugin,e.player.killer!!)
|
|
||||||
e.player.showPlayer(plugin,it)
|
e.player.showPlayer(plugin,it)
|
||||||
e.player.killer!!.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(!list.first) return
|
||||||
if(combatData.instance.getCanSeeWorld(e.player.world.name)){
|
if(combatData.instance.getCanSeeWorld(e.player.world.name)){
|
||||||
Bukkit.getOnlinePlayers().forEach{
|
Bukkit.getOnlinePlayers().forEach{
|
||||||
it.showPlayer(plugin,e.player)
|
if(it.uniqueId == e.player.uniqueId || it.uniqueId == e.player.killer!!.uniqueId) return@forEach
|
||||||
it.showPlayer(plugin,e.player.killer!!)
|
|
||||||
e.player.showPlayer(plugin,it)
|
e.player.showPlayer(plugin,it)
|
||||||
e.player.killer!!.showPlayer(plugin,it)
|
e.player.killer!!.showPlayer(plugin,it)
|
||||||
}
|
}
|
||||||
|
@ -1,5 +1,5 @@
|
|||||||
name: Combat
|
name: Combat
|
||||||
version: 1.0-SNAPSHOT
|
version: 1.0.1
|
||||||
main: group.pvpconnect.combat_f.Main
|
main: group.pvpconnect.combat_f.Main
|
||||||
api-version: 1.19
|
api-version: 1.19
|
||||||
author: faiz
|
author: faiz
|
||||||
|
Loading…
Reference in New Issue
Block a user