#patch Fixed 1.20.6 and 1.21 (#79)

* Bump version from 2.0.11 to 2.0.11-SNAPSHOT0 * Changed ServerVersion as 1.20.6+ removed package nms * Bump version from 2.0.11-SNAPSHOT0 to 2.0.11-SNAPSHOT1 --------- Co-authored-by: version-bump[github-action] <41898282+version-bump[github-action]@users.noreply.github.com>
Plugily-Projects · Jul 12, 2024 · c98b605 · c98b605
1 parent be284a5
commit c98b605
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 8 deletions.
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -17,15 +17,15 @@ repositories {
 }
 
 dependencies {
-    implementation("plugily.projects:MiniGamesBox-Classic:1.3.12") { isTransitive = false }
+    implementation("plugily.projects:MiniGamesBox-Classic:1.3.13") { isTransitive = false }
     compileOnly("org.spigotmc:spigot-api:1.20.4-R0.1-SNAPSHOT")
     compileOnly("io.papermc.paper:paper-api:1.20.4-R0.1-SNAPSHOT")
     compileOnly("org.jetbrains:annotations:24.0.1")
     compileOnly(files("lib/CorpseReborn.jar"))
 }
 
 group = "plugily.projects"
-version = "2.0.11"
+version = "2.0.11-SNAPSHOT1"
 description = "MurderMystery"
 
 java {

diff --git a/src/main/java/plugily/projects/murdermystery/arena/ArenaEvents.java b/src/main/java/plugily/projects/murdermystery/arena/ArenaEvents.java
@@ -240,7 +240,7 @@ public void onMurdererDamage(EntityDamageByEntityEvent e) {
     }
 
     //check if sword has cooldown
-    if(ServerVersion.Version.isCurrentLower(ServerVersion.Version.v1_11_R1)) {
+    if(ServerVersion.Version.isCurrentLower(ServerVersion.Version.v1_11)) {
       if(plugin.getUserManager().getUser(attacker).getCooldown("sword_attack") > 0) {
         return;
       }

diff --git a/src/main/java/plugily/projects/murdermystery/arena/special/SpecialBlockEvents.java b/src/main/java/plugily/projects/murdermystery/arena/special/SpecialBlockEvents.java
@@ -63,7 +63,7 @@ public void onSpecialBlockClick(PlayerInteractEvent event) {
     if(event.getClickedBlock() == null)
       return;
 
-    if(ServerVersion.Version.isCurrentEqualOrHigher(ServerVersion.Version.v1_11_R1) && event.getHand() == org.bukkit.inventory.EquipmentSlot.OFF_HAND) {
+    if(ServerVersion.Version.isCurrentEqualOrHigher(ServerVersion.Version.v1_11) && event.getHand() == org.bukkit.inventory.EquipmentSlot.OFF_HAND) {
       return;
     }
 

diff --git a/src/main/java/plugily/projects/murdermystery/events/PluginEvents.java b/src/main/java/plugily/projects/murdermystery/events/PluginEvents.java
@@ -91,7 +91,7 @@ public void onSwordThrow(PlayerInteractEvent event) {
       return;
     }
     attackerUser.setCooldown("sword_shoot", swordFlyCooldown);
-    if(ServerVersion.Version.isCurrentLower(ServerVersion.Version.v1_11_R1)) {
+    if(ServerVersion.Version.isCurrentLower(ServerVersion.Version.v1_11)) {
       attackerUser.setCooldown("sword_attack", (plugin.getConfig().getInt("Sword.Cooldown.Attack", 1)));
     } else {
       VersionUtils.setMaterialCooldown(attacker ,plugin.getSwordSkinManager().getMurdererSword(attacker).getType(), 20 * (plugin.getConfig().getInt("Sword.Cooldown.Attack", 1)));
@@ -107,7 +107,7 @@ private void createFlyingSword(Player attacker, IUser attackerUser) {
     standStart.setYaw(loc.getYaw());
     ArmorStand stand = (ArmorStand) attacker.getWorld().spawnEntity(standStart, EntityType.ARMOR_STAND);
     stand.setVisible(false);
-    if(ServerVersion.Version.isCurrentHigher(ServerVersion.Version.v1_8_R3)) {
+    if(ServerVersion.Version.isCurrentHigher(ServerVersion.Version.v1_8_8)) {
       stand.setInvulnerable(true);
       stand.setSilent(true);
     }
@@ -120,7 +120,7 @@ private void createFlyingSword(Player attacker, IUser attackerUser) {
     stand.setGravity(false);
     stand.setRemoveWhenFarAway(true);
 
-    if(ServerVersion.Version.isCurrentEqualOrHigher(ServerVersion.Version.v1_8_R3)) {
+    if(ServerVersion.Version.isCurrentEqualOrHigher(ServerVersion.Version.v1_8_8)) {
       stand.setMarker(true);
     }
 

diff --git a/src/main/java/plugily/projects/murdermystery/handlers/CorpseHandler.java b/src/main/java/plugily/projects/murdermystery/handlers/CorpseHandler.java
@@ -87,7 +87,7 @@ public void spawnCorpse(Player player, Arena arena) {
       head.setItemMeta(meta);
 
       stand.setVisible(false);
-      if(ServerVersion.Version.isCurrentEqualOrHigher(ServerVersion.Version.v1_16_R1)) {
+      if(ServerVersion.Version.isCurrentEqualOrHigher(ServerVersion.Version.v1_16)) {
         stand.getEquipment().setHelmet(head);
       } else {
         stand.setHelmet(head);