feat: add disable_collision option to settings.yml

Syrent · Feb 9, 2024 · 5199e59 · 5199e59
1 parent b80de9a
commit 5199e59
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 21 deletions.
diff --git a/src/main/java/ir/syrent/velocityvanish/spigot/core/VanishManager.kt b/src/main/java/ir/syrent/velocityvanish/spigot/core/VanishManager.kt
@@ -26,6 +26,7 @@ import ir.syrent.velocityvanish.spigot.utils.Utils
 import ir.syrent.velocityvanish.spigot.utils.sendMessage
 import ir.syrent.velocityvanish.utils.TextReplacement
 import ir.syrent.velocityvanish.utils.component
+import net.kyori.adventure.platform.bukkit.MinecraftComponentSerializer
 import org.bukkit.GameMode
 import org.bukkit.entity.Creature
 import org.bukkit.entity.Player
@@ -243,20 +244,10 @@ class VanishManager(
             DependencyManager.sunlightHook.vanish(player, true)
         }
 
-        if (ServerVersion.supports(9)) {
+        if (ServerVersion.supports(9) && Settings.disableCollision) {
             denyPush(player)
         }
 
-        /*if (DependencyManager.proCosmeticsHook.exists) {
-            Ruom.runSync({
-                try {
-                    DependencyManager.proCosmeticsHook.proCosmetics.userManager?.getUser(player.uniqueId)?.unequipCosmetics(true)
-                } catch (e: Exception) {
-                    Ruom.warn("Failed to un-equip cosmetics for player ${player.name}, is ProCosmetics up to date?")
-                }
-            }, 20)
-        }*/
-
         if (DependencyManager.squareMapHook.exists) {
             DependencyManager.squareMapHook.squareMap.playerManager().hide(player.uniqueId, true)
         }
@@ -351,7 +342,7 @@ class VanishManager(
 
         Utils.actionbarPlayers.remove(player)
 
-        if (ServerVersion.supports(9)) {
+        if (ServerVersion.supports(9) && Settings.disableCollision) {
             allowPush(player)
         }
 

diff --git a/src/main/java/ir/syrent/velocityvanish/spigot/storage/Settings.kt b/src/main/java/ir/syrent/velocityvanish/spigot/storage/Settings.kt
@@ -47,6 +47,7 @@ object Settings {
     var invincible = true
     var silentOpenContainer = true
     var fakeJoinLeaveMessage = true
+    var disableCollision = false
 
     var forcePreventPrivateMessages = true
 
@@ -101,6 +102,7 @@ object Settings {
         invincible = settingsConfig.getBoolean("vanish.invincible")
         silentOpenContainer = settingsConfig.getBoolean("vanish.silent_open_container")
         fakeJoinLeaveMessage = settingsConfig.getBoolean("vanish.fake_join_leave_message")
+        disableCollision = settingsConfig.getBoolean("vanish.disable_collision")
 
         preventPickup = settingsConfig.getBoolean("vanish.prevent.pickup")
         preventBlockBreak = settingsConfig.getBoolean("vanish.prevent.block_break")

diff --git a/src/main/resources/settings.yml b/src/main/resources/settings.yml
@@ -13,42 +13,35 @@ support_legacy_color_codes: false
 force_vanish_if_first: true
 
 bstats: true
-
 # Leave sounds blank to disable them
 # Example: command: ""
 sounds:
     command: "ENTITY_EXPERIENCE_ORB_PICKUP"
     vanish: "ENTITY_EXPERIENCE_ORB_PICKUP"
     unvanish: "ENTITY_EXPERIENCE_ORB_PICKUP"
-
 vanish:
     # Show players an actionbar when they are vanished
     actionbar: true
-
     # Remember vanish data after switching servers?
     # Note: Requires Velocity as a proxy server
     remember: true
-
     # Should we change player type to spectator in tablist for players who have permission to see vanished players?
     # Note: Requires ProtocolLib in versions lower than 1.19
     see_as_spectator: true
-
     # Should vanished players be protected from all damage sources?
     invincible: true
-
     # You can also achieve this by setting the fake join/leave message to blank in the language file
     fake_join_leave_message: true
-
     silent_open_container: true
-
+    # Might cause incompatibility with some plugins like TAB and eGlow
+    disable_collision: false
     prevent:
         pickup: true
         block_break: false
         block_place: false
         interact: false
         # Only works on PaperMC servers (Paper, Purpur, Pufferfish, etc...)
         advancement: true
-
 hooks:
     essentials:
         force_prevent_private_messages: false