Compare commits
16 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
4707291704 | ||
|
|
321d3ed92c | ||
|
|
88b25f93ce | ||
|
|
244626682e | ||
|
|
af6b811458 | ||
|
|
e5064aabef | ||
|
|
558431d39c | ||
|
|
eca0980869 | ||
|
|
5645698d3f | ||
|
|
d4cf108d52 | ||
|
|
95c8fe5277 | ||
|
|
0975391c9c | ||
|
|
3d4666f7e0 | ||
|
|
ae2c9680f3 | ||
|
|
ad3892fc90 | ||
|
|
658aeee2cc |
1
.github/CODEOWNERS
vendored
Normal file
1
.github/CODEOWNERS
vendored
Normal file
@@ -0,0 +1 @@
|
||||
* @WillFP
|
||||
@@ -3,7 +3,7 @@ version = rootProject.version
|
||||
|
||||
dependencies {
|
||||
compileOnly("io.papermc.paper:paper-api:1.19.3-R0.1-SNAPSHOT")
|
||||
compileOnly("com.ticxo.modelengine:api:R3.1.5")
|
||||
compileOnly("com.ticxo.modelengine:api:R3.1.6")
|
||||
compileOnly("com.github.ben-manes.caffeine:caffeine:3.0.2")
|
||||
|
||||
implementation("com.willfp:ecomponent:1.3.0")
|
||||
@@ -11,9 +11,12 @@ dependencies {
|
||||
|
||||
publishing {
|
||||
publications {
|
||||
register("maven", MavenPublication::class) {
|
||||
from(components["java"])
|
||||
register<MavenPublication>("maven") {
|
||||
groupId = project.group.toString()
|
||||
version = project.version.toString()
|
||||
artifactId = rootProject.name
|
||||
|
||||
artifact(rootProject.tasks.shadowJar.get().archiveFile)
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -9,6 +9,7 @@ import com.willfp.ecopets.pets.hasPet
|
||||
import com.willfp.ecopets.pets.setPetLevel
|
||||
import org.bukkit.Bukkit
|
||||
import org.bukkit.command.CommandSender
|
||||
import org.bukkit.entity.Player
|
||||
import org.bukkit.util.StringUtil
|
||||
|
||||
class CommandGive(plugin: EcoPlugin) : Subcommand(plugin, "give", "ecopets.command.give", false) {
|
||||
@@ -28,7 +29,7 @@ class CommandGive(plugin: EcoPlugin) : Subcommand(plugin, "give", "ecopets.comma
|
||||
@Suppress("DEPRECATION")
|
||||
val player = Bukkit.getOfflinePlayer(playerName)
|
||||
|
||||
if (!player.hasPlayedBefore()) {
|
||||
if (!player.hasPlayedBefore() && player !is Player) {
|
||||
sender.sendMessage(plugin.langYml.getMessage("invalid-player"))
|
||||
return
|
||||
}
|
||||
|
||||
@@ -36,6 +36,11 @@ class PetDisplay(
|
||||
val pet = player.activePet
|
||||
|
||||
if (pet != null) {
|
||||
if (player.isInvisible) {
|
||||
remove(player)
|
||||
return
|
||||
}
|
||||
|
||||
@Suppress("DEPRECATION")
|
||||
stand.customName = plugin.configYml.getString("pet-entity.name")
|
||||
.replace("%player%", player.displayName)
|
||||
@@ -77,6 +82,10 @@ class PetDisplay(
|
||||
}
|
||||
|
||||
private fun getOrNew(player: Player): ArmorStand? {
|
||||
if (player.isInvisible) {
|
||||
return null
|
||||
}
|
||||
|
||||
val tracked = trackedEntities[player.uniqueId]
|
||||
val existing = tracked?.stand
|
||||
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
#libreforge-updater
|
||||
#Sat May 20 17:41:14 BST 2023
|
||||
#Tue Jul 04 14:49:52 BST 2023
|
||||
kotlin.code.style=official
|
||||
libreforge-version=4.14.2
|
||||
version=2.14.2
|
||||
libreforge-version=4.21.0
|
||||
version=2.20.0
|
||||
|
||||
Reference in New Issue
Block a user