Skip to content

Commit fdd910e

Browse files
authored
Log IOException in plugin update (#7960)
1 parent 036a09c commit fdd910e

File tree

1 file changed

+10
-5
lines changed

1 file changed

+10
-5
lines changed

patches/api/0378-Update-Folder-Uses-Plugin-Name.patch

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ Subject: [PATCH] Update Folder Uses Plugin Name
55

66

77
diff --git a/src/main/java/org/bukkit/plugin/SimplePluginManager.java b/src/main/java/org/bukkit/plugin/SimplePluginManager.java
8-
index 45114d587a8f201778adcba16c8a019f9959f472..ed07f5820281b139739f673fa4e25171de81b894 100644
8+
index 45114d587a8f201778adcba16c8a019f9959f472..5270e43c629fe63f42691d10c6f77dc1cc987457 100644
99
--- a/src/main/java/org/bukkit/plugin/SimplePluginManager.java
1010
+++ b/src/main/java/org/bukkit/plugin/SimplePluginManager.java
1111
@@ -395,7 +395,7 @@ public final class SimplePluginManager implements PluginManager {
@@ -17,7 +17,7 @@ index 45114d587a8f201778adcba16c8a019f9959f472..ed07f5820281b139739f673fa4e25171
1717

1818
Set<Pattern> filters = fileAssociations.keySet();
1919
Plugin result = null;
20-
@@ -422,16 +422,56 @@ public final class SimplePluginManager implements PluginManager {
20+
@@ -422,16 +422,61 @@ public final class SimplePluginManager implements PluginManager {
2121
return result;
2222
}
2323

@@ -48,16 +48,21 @@ index 45114d587a8f201778adcba16c8a019f9959f472..ed07f5820281b139739f673fa4e25171
4848
+ continue;
4949
+ }
5050
+ if (!pluginName.equals(updatePluginName)) continue;
51-
+ if (!FileUtil.copy(updateFile, file)) continue;
51+
+ try {
52+
+ java.nio.file.Files.copy(updateFile.toPath(), file.toPath());
53+
+ } catch (java.io.IOException exception) {
54+
+ server.getLogger().log(Level.SEVERE, "Could not copy '" + updateFile.getPath() + "' to '" + file.getPath() + "' in update plugin process", exception);
55+
+ continue;
56+
+ }
5257
+ File newName = new File(file.getParentFile(), updateFile.getName());
5358
+ file.renameTo(newName);
5459
+ updateFile.delete();
5560
+ return newName;
5661
+ }
57-
+ }
62+
}
5863
+ catch (InvalidDescriptionException e) {
5964
+ throw new InvalidPluginException(e);
60-
}
65+
+ }
6166
+ return file;
6267
+ }
6368

0 commit comments

Comments
 (0)