Skip to content

Commit da9d110

Browse files
committed
Remove chunk save reattempt patch
This patch does not appear to be doing anything useful, and may hide errors. Currently, the save logic does not run through this path either so it did not do anything. Additionally, properly implement support for handling RegionFileSizeException in Moonrise.
1 parent 0cc7bd4 commit da9d110

File tree

1,009 files changed

+663
-691
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

1,009 files changed

+663
-691
lines changed

patches/server/0065-Chunk-Save-Reattempt.patch

Lines changed: 0 additions & 55 deletions
This file was deleted.

patches/server/0067-Default-loading-permissions.yml-before-plugins.patch renamed to patches/server/0066-Default-loading-permissions.yml-before-plugins.patch

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ modify that. Under the previous logic, plugins were unable (cleanly) override pe
1616
A config option has been added for those who depend on the previous behavior, but I don't expect that.
1717

1818
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
19-
index bb562ada45b828c79d83afdd1687edd32cbaf1dc..d581bfad059e60a693bc27285a723979e7d7dd34 100644
19+
index 3422b2978eb69c537c19abacbb10ce8a5423756a..248de665ebf0e1ddfb10616f6213fa344cd88d40 100644
2020
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
2121
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
2222
@@ -490,6 +490,7 @@ public final class CraftServer implements Server {

patches/server/0069-Remove-Metadata-on-reload.patch renamed to patches/server/0068-Remove-Metadata-on-reload.patch

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ Metadata is not meant to persist reload as things break badly with non primitive
77
This will remove metadata on reload so it does not crash everything if a plugin uses it.
88

99
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
10-
index 2b4c1c3cc4b740d5aceb483c4066f23433c175d9..c6ea35f752c9a0bf9e5e07e3b501fd3fe8c30084 100644
10+
index a8ee4d5b932e42367df9e74dacd0e3f1fdbe7d11..c6a0765e6cfbe90444b91a19039483070600df6d 100644
1111
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
1212
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
1313
@@ -1005,8 +1005,16 @@ public final class CraftServer implements Server {

patches/server/0070-Handle-Item-Meta-Inconsistencies.patch renamed to patches/server/0069-Handle-Item-Meta-Inconsistencies.patch

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -149,7 +149,7 @@ index 101eea3452c9e387e770b716543c3a4f17b9a737..aea09533fada5bd3d42e2cc147921167
149149

150150
static Map<Enchantment, Integer> getEnchantments(net.minecraft.world.item.ItemStack item) {
151151
diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java
152-
index 1c943638bfbda8281d2c9038e9024591823e2b5e..b2683d6efd53b03d7043098b19a1504885a5b3c7 100644
152+
index b02149d371b3b65537655f8e9713428e19bbc180..d9bbeb08cb58b1fbea5c6aab8f926236639e031d 100644
153153
--- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java
154154
+++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java
155155
@@ -6,6 +6,7 @@ import com.google.common.collect.ImmutableList;

0 commit comments

Comments
 (0)