fix door animation duplication issue, mark for release 1.18.1r2

Signed-off-by: Mineshafter61 <yuhang.061@gmail.com>
Mineshafter61 · Feb 1, 2022 · 8171928 · 8171928
1 parent 722f318
commit 8171928
Show file tree

Hide file tree

Showing 10 changed files with 7 additions and 6 deletions.
diff --git a/.gradle/7.2/executionHistory/executionHistory.bin b/.gradle/7.2/executionHistory/executionHistory.bin
diff --git a/.gradle/7.2/executionHistory/executionHistory.lock b/.gradle/7.2/executionHistory/executionHistory.lock
diff --git a/.gradle/7.2/fileHashes/fileHashes.bin b/.gradle/7.2/fileHashes/fileHashes.bin
diff --git a/.gradle/7.2/fileHashes/fileHashes.lock b/.gradle/7.2/fileHashes/fileHashes.lock
diff --git a/.gradle/7.2/fileHashes/resourceHashesCache.bin b/.gradle/7.2/fileHashes/resourceHashesCache.bin
diff --git a/.gradle/buildOutputCleanup/buildOutputCleanup.lock b/.gradle/buildOutputCleanup/buildOutputCleanup.lock
diff --git a/.gradle/buildOutputCleanup/outputFiles.bin b/.gradle/buildOutputCleanup/outputFiles.bin
diff --git a/build.gradle b/build.gradle
@@ -3,7 +3,7 @@ plugins {
 }
 
 group 'org.mikeshafter'
-version '1.18.1b4'
+version '1.18.1r2'
 
 compileJava.options.encoding 'UTF-8'
 

diff --git a/build/tmp/compileJava/previous-compilation-data.bin b/build/tmp/compileJava/previous-compilation-data.bin
diff --git a/src/main/java/mikeshafter/mikestcaddons/SignActionSwap.java b/src/main/java/mikeshafter/mikestcaddons/SignActionSwap.java
@@ -7,7 +7,6 @@
 import com.bergerkiller.bukkit.tc.signactions.SignAction;
 import com.bergerkiller.bukkit.tc.signactions.SignActionType;
 import com.bergerkiller.bukkit.tc.utils.SignBuildOptions;
-import org.bukkit.plugin.Plugin;
 
 import java.util.Set;
 
@@ -25,8 +24,7 @@ private void swap(MinecartMember<?> member) {
     Set<ConfigurationNode> attachments = fullConfig.getNode("attachments").getNodes();
     if (attachments != null) {
       for (ConfigurationNode node : attachments) {
-        Plugin plugin = MikesTCAddons.getPlugin(MikesTCAddons.class);
-        plugin.getLogger().info("1 "+node.getHeader());
+
         ConfigurationNode attachment = member.getProperties().getModel().getConfig().getNode("attachments");
         attachment.set(node.getPath(), swap(node));
         fullConfig.set("attachments", attachment);
@@ -47,10 +45,13 @@ private ConfigurationNode swap(ConfigurationNode attachmentNode) {
     if (animationNames.contains("door_R")) {
       for (String name : animationNames) {
         if (name.contains("door_R")) {
+//          Plugin plugin = MikesTCAddons.getPlugin(MikesTCAddons.class);
+//          plugin.getLogger().info(name);
+//          plugin.getLogger().info("door_L"+name.substring(6));
           // set to new node
           animations.set("door_L"+name.substring(6), animations.getNode(name));
           // remove
-          attachmentNode.remove(name);
+          animations.remove(name);
           attachmentNode.set("animations", animations);
         }
       }
@@ -63,7 +64,7 @@ else if (animationNames.contains("door_L")) {
           // set to new node
           animations.set("door_R"+name.substring(6), animations.getNode(name));
           // remove
-          attachmentNode.remove(name);
+          animations.remove(name);
           attachmentNode.set("animations", animations);
         }
       }