From 2c76c23bf22e30799cc9d26e16dcbf47358be142 Mon Sep 17 00:00:00 2001 From: Jesse Boyd Date: Thu, 11 Jul 2019 08:11:37 +1000 Subject: [PATCH 1/5] don't use nms world.n --- .../java/com/boydti/fawe/bukkit/v1_13/BukkitChunk_1_13.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/worldedit-bukkit/src/main/java/com/boydti/fawe/bukkit/v1_13/BukkitChunk_1_13.java b/worldedit-bukkit/src/main/java/com/boydti/fawe/bukkit/v1_13/BukkitChunk_1_13.java index a023fc927..7906618db 100644 --- a/worldedit-bukkit/src/main/java/com/boydti/fawe/bukkit/v1_13/BukkitChunk_1_13.java +++ b/worldedit-bukkit/src/main/java/com/boydti/fawe/bukkit/v1_13/BukkitChunk_1_13.java @@ -570,7 +570,10 @@ public class BukkitChunk_1_13 extends IntFaweChunk { for (Map.Entry entry : toRemove.entrySet()) { BlockPosition bp = entry.getKey(); TileEntity tile = entry.getValue(); - nmsWorld.n(bp); + tile.y(); +// nmsWorld.c.remove(bp); +// nmsWorld.tileEntityList.remove(bp); +// nmsWorld.tileEntityListTick.remove(bp); tiles.remove(bp); tile.z(); tile.invalidateBlockCache(); From fee57017cd8f5a2e88f846259bb591702f9cdca1 Mon Sep 17 00:00:00 2001 From: NotMyFault Date: Thu, 11 Jul 2019 22:50:28 +0200 Subject: [PATCH 2/5] Bump dummy version to 1.14 --- .../worldedit/bukkit/WorldEditPlugin.java | 2 +- .../src/main/resources/DummyFawe.src | Bin 2016 -> 2009 bytes 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/worldedit-bukkit/src/main/java/com/sk89q/worldedit/bukkit/WorldEditPlugin.java b/worldedit-bukkit/src/main/java/com/sk89q/worldedit/bukkit/WorldEditPlugin.java index faa7954c9..aa44302de 100644 --- a/worldedit-bukkit/src/main/java/com/sk89q/worldedit/bukkit/WorldEditPlugin.java +++ b/worldedit-bukkit/src/main/java/com/sk89q/worldedit/bukkit/WorldEditPlugin.java @@ -276,7 +276,7 @@ public class WorldEditPlugin extends JavaPlugin { //implements TabCompleter } File pluginsFolder = MainUtil.getJarFile().getParentFile(); for (File file : pluginsFolder.listFiles()) { - if (file.length() == 2016) return; + if (file.length() == 2009) return; } Plugin plugin = Bukkit.getPluginManager().getPlugin("FastAsyncWorldEdit"); File dummy = MainUtil.copyFile(MainUtil.getJarFile(), "DummyFawe.src", pluginsFolder, "DummyFawe.jar"); diff --git a/worldedit-bukkit/src/main/resources/DummyFawe.src b/worldedit-bukkit/src/main/resources/DummyFawe.src index 5fd4b7be3b6cd50df1067d345e1d8f0aaefea779..16854279b28fd1bd16e41b9f8947602740699ad1 100644 GIT binary patch delta 1084 zcmV-C1jGB_57`f}5(0lJvFlD{qZ*ye0{{T+6aWAU0001RY;|X8ZZ3IkY>k-9uH!Zg zhW7#T4#6x790SworrEW?^cA`&x}YW6RzpiFDJAhd{m8kUIhp8^RUmyPDbk{T*}{zb z-CrQ#4_U1G+cD{{+Jx<924nX-<>sz;iw>q6;Dp_u1op7q9Fc#;xHSLibNBhTPumT6 z^Y$1_V_(ux43lHo@BaBZd&Btqum5g09(gvhVzS?EcDsvFPcF#+5g7GlaQ$fzUMv=8cM16|@JpniYwLiCFVk&bbExcULifv4 zWT0nbpPf1Xm}h?^2f7^bnpF?#(Dfijy*8E$`?QuEQ^~J^zld9bRYu+ zy56`MJ7Wh|CIrK4;0}ITQ@ zkJQ0SdFxam2k(@?5gV3C2;6`gU3a^aI&?Wl>)2E< zb^@zQb6s%bNZ1gIv#IN?Fzr#{40O1WqoTuR~PeW&p33t9WY z+GK{jQwv@u7o;pDV$zb{r~{m_h3S&!h9;0PwFfcz&Czp|sp~1V*L0*(8AEouV#&vv z5oK6CziQ7+W7wtccqPO)Fp)2Ps0E!M6k6mB3TTz7WMM)xPNA|qSZcn!O9@Xx>mf!f zp{akC_&v2yS5uV(@yeEz>YZpX1K!h8M#|dl%G9Lbjk-(OeGx04PPc7yF3*pgWJ9Q| z%=xw3NU?bZ=O~FKO1H`~GXSq`zsL~x(NLKwT>&pZHImzb%jG3OfH$=$s&E52r{4xc zREb(V=FhP8`FaP^eEC$9GjS$3LSgy@MX7(a>KW*ZqGm;UEK0}~v4vabE%_xxY~Deb zAUijv!e`Ti=V0s@jbt~D0#c>=#Z_7`M6KM`i>NgFK9JjHJN~OrCYO^ zfom-clgQFl>}VtwW%v~fz$1nhW=&14<*(Pk7F%u@9;)s;P)h*<6axwX00;;G9k!Fa z1`e|y23r9QDzWQMWuqFM%mV-b?URQGD-NJ#28Sd#)d4TE{(&SolfVZW2K)s80000_ CAp;oz delta 1105 zcmV-X1g`tp58w~55(0nP0?kgyn+(a*0{{T_6aWAU0001RY;|X8ZZ3IkY>k-Bj^j2A z$L|B=9fCa;h=FZS&8-D?U!jMh2U?sz;iw>q6;DX)n1opIhJ0pLKamoJWYxnh+L(d2& zW5+MMH}K}LSyyBFDTc|h9QS{Io4sND_2<8KZytFzvSM=Fz3ulm@19(ceeTfhM!j~HOZ&3+9#ik{iNDBOfmKMa49*UQ z=l@zZe_e0fjGeKAD-(iGZGHyGNS07jw5L*x_2C;NSr=q{?|^luVyHu@%K>wks0n8X zMs03C5v>2=)D)PC;xTF#YmYOHD0l5NM z2$6xzk6O$N5J`m@(rl_RGCLQh3N*WF4a&Rq0WlWm<$Fq@uod2!{P`+KsP4PnNgcYK zqjhY`It$&U@XoHbF1T?dY{C#7L*p9O5daT(k`#rSS58 zP?G31m#;K}>#g^c-dCdP?Ip9jR2t zke#l0^0DSb8CIWPwO34I+NJ4uC&V`}k#BRT1)U%iM&ttuXqBl{VL~%bp|U(!YO%aa z1y6rMYZIfD)Kp9Uo?588tIC0RXG==;ooH|a-qTV>%G&MD)TH2px=UHEXy#}`Ua>KBxx_<#sO928D0}7Mp z1{Jdy23r9Q+5*i^$eRqw(*pni_LG1ID=yq>-(PJZ)d9{mMz(1o)d9DAn#4r-)B#XS X1qJ{B000L72LQ(b0009900000OHUFA From b3e11d2094c028871c4723b4299cf1e5cb7e4d04 Mon Sep 17 00:00:00 2001 From: Jesse Boyd Date: Wed, 17 Jul 2019 05:16:08 +1000 Subject: [PATCH 3/5] patch for missing tile position data --- .../clipboard/io/SpongeSchematicReader.java | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) diff --git a/worldedit-core/src/main/java/com/sk89q/worldedit/extent/clipboard/io/SpongeSchematicReader.java b/worldedit-core/src/main/java/com/sk89q/worldedit/extent/clipboard/io/SpongeSchematicReader.java index c6649a0c9..4cc72a692 100644 --- a/worldedit-core/src/main/java/com/sk89q/worldedit/extent/clipboard/io/SpongeSchematicReader.java +++ b/worldedit-core/src/main/java/com/sk89q/worldedit/extent/clipboard/io/SpongeSchematicReader.java @@ -183,9 +183,20 @@ public class SpongeSchematicReader extends NBTSchematicReader { setupClipboard(0, uuid); } int[] pos = value.getIntArray("Pos"); - int x = pos[0]; - int y = pos[1]; - int z = pos[2]; + int x,y,z; + if (pos == null) { + System.out.println("Invalid tile " + value); + if (!value.containsKey("x") || !value.containsKey("y") || !value.containsKey("z")) { + return; + } + x = value.getInt("x"); + y = value.getInt("y"); + z = value.getInt("z"); + } else { + x = pos[0]; + y = pos[1]; + z = pos[2]; + } fc.setTile(x, y, z, value); } }); From 75f059fdc5083ccf3963a4ecd39cbf8ea90995ff Mon Sep 17 00:00:00 2001 From: Jesse Boyd Date: Wed, 17 Jul 2019 05:28:55 +1000 Subject: [PATCH 4/5] check length, not null --- .../worldedit/extent/clipboard/io/SpongeSchematicReader.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/worldedit-core/src/main/java/com/sk89q/worldedit/extent/clipboard/io/SpongeSchematicReader.java b/worldedit-core/src/main/java/com/sk89q/worldedit/extent/clipboard/io/SpongeSchematicReader.java index 4cc72a692..098f70081 100644 --- a/worldedit-core/src/main/java/com/sk89q/worldedit/extent/clipboard/io/SpongeSchematicReader.java +++ b/worldedit-core/src/main/java/com/sk89q/worldedit/extent/clipboard/io/SpongeSchematicReader.java @@ -184,7 +184,7 @@ public class SpongeSchematicReader extends NBTSchematicReader { } int[] pos = value.getIntArray("Pos"); int x,y,z; - if (pos == null) { + if (pos.length != 3) { System.out.println("Invalid tile " + value); if (!value.containsKey("x") || !value.containsKey("y") || !value.containsKey("z")) { return; From 5d41bdb7c75528e67e19f0b6032d913c4623f622 Mon Sep 17 00:00:00 2001 From: Jesse Boyd Date: Wed, 17 Jul 2019 06:10:18 +1000 Subject: [PATCH 5/5] merge from breaking --- .../java/com/boydti/fawe/bukkit/v1_14/BukkitChunk_1_14.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/worldedit-bukkit/src/main/java/com/boydti/fawe/bukkit/v1_14/BukkitChunk_1_14.java b/worldedit-bukkit/src/main/java/com/boydti/fawe/bukkit/v1_14/BukkitChunk_1_14.java index ed2041bec..0309eec7e 100644 --- a/worldedit-bukkit/src/main/java/com/boydti/fawe/bukkit/v1_14/BukkitChunk_1_14.java +++ b/worldedit-bukkit/src/main/java/com/boydti/fawe/bukkit/v1_14/BukkitChunk_1_14.java @@ -560,7 +560,7 @@ public class BukkitChunk_1_14 extends IntFaweChunk { for (Map.Entry entry : toRemove.entrySet()) { BlockPosition bp = entry.getKey(); TileEntity tile = entry.getValue(); - nmsWorld.removeTileEntity(bp); + tile.m(); tiles.remove(bp); tile.n(); tile.invalidateBlockCache();