Mirrors/Purpur
1
0
Fork 1
mirror of https://github.com/PurpurMC/Purpur.git synced 2026-02-17 16:37:43 +01:00
Code Issues Packages Projects Releases Wiki Activity

Updated Upstream (Paper & Pufferfish)

Browse Source 
Upstream has released updates that appear to apply and compile correctly

Paper Changes:
PaperMC/Paper@af94364 Fix slime spawners not spawning outside slime chunks (#7741)
PaperMC/Paper@6b9f7a0 Don't fire worldborder events for virtual borders (#7749)
PaperMC/Paper@8bfb1d2 Pass ServerLevel for gamerule callbacks (#7668)
PaperMC/Paper@c66b0f9 Add pre-unbreaking amount to PlayerItemDamageEvent (#7724)
PaperMC/Paper@86fb3d2 Don't send itemmeta for books with the hide option enabled (#7734)
PaperMC/Paper@c642d25 Improve update folder behavior (#7687)

Pufferfish Changes:
pufferfish-gg/Pufferfish@1bedb87 Updated Upstream (Paper)
pufferfish-gg/Pufferfish@952b720 Add additional SIMD debug info/fix messages
pufferfish-gg/Pufferfish@54099cf Put Java 18 in SIMD error messages
This commit is contained in:
BillyGalbreath
2022-04-18 12:41:35 -05:00
parent d4c11601c7
commit e973e3cbcc
12 changed files with 46 additions and 76 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
patches/api/0001-Pufferfish-API-Changes.patch
View File

@@ -214,10 +214,10 @@ index 0000000000000000000000000000000000000000..10310fdd53de28efb8a8250f6d3b0c8e
+}
diff --git a/src/main/java/gg/pufferfish/pufferfish/simd/SIMDChecker.java b/src/main/java/gg/pufferfish/pufferfish/simd/SIMDChecker.java
new file mode 100644
index 0000000000000000000000000000000000000000..3e36d19582172232f617ffc7045dd2012665b99a
index 0000000000000000000000000000000000000000..66244a98901fff4479c50ce955502e2975f804c6
--- /dev/null
+++ b/src/main/java/gg/pufferfish/pufferfish/simd/SIMDChecker.java
@@ -0,0 +1,29 @@
@@ -0,0 +1,30 @@
+package gg.pufferfish.pufferfish.simd;
+
+import jdk.incubator.vector.IntVector;
@@ -234,6 +234,7 @@ index 0000000000000000000000000000000000000000..3e36d19582172232f617ffc7045dd201
+ if (SIMDDetection.getJavaVersion() != 17 && SIMDDetection.getJavaVersion() != 18) {
+ return false;
+ } else {
+ SIMDDetection.testRun = true;
+ IntVector oneVector = IntVector.broadcast(IntVector.SPECIES_256, 1);
+ IntVector twoVector = IntVector.broadcast(IntVector.SPECIES_256, 2);
+ IntVector result = oneVector.add(twoVector);
@@ -249,10 +250,10 @@ index 0000000000000000000000000000000000000000..3e36d19582172232f617ffc7045dd201
+}
diff --git a/src/main/java/gg/pufferfish/pufferfish/simd/SIMDDetection.java b/src/main/java/gg/pufferfish/pufferfish/simd/SIMDDetection.java
new file mode 100644
index 0000000000000000000000000000000000000000..c6a7f59b246ab9a8f3c7ac895287ed71a28a6aaa
index 0000000000000000000000000000000000000000..d5ee3dfde2fed1f1bec49df22ba37ce725de4c2c
--- /dev/null
+++ b/src/main/java/gg/pufferfish/pufferfish/simd/SIMDDetection.java
@@ -0,0 +1,32 @@
@@ -0,0 +1,33 @@
+package gg.pufferfish.pufferfish.simd;
+
+@Deprecated
@@ -260,6 +261,7 @@ index 0000000000000000000000000000000000000000..c6a7f59b246ab9a8f3c7ac895287ed71
+
+ public static boolean isEnabled = false;
+ public static boolean versionLimited = false;
+ public static boolean testRun = false;
+
+ @Deprecated
+ public static boolean canEnable() {
@@ -407,10 +409,10 @@ index b937441d2fb46b108644c49fcf073859765aa02e..d95b01bfd0657cf089c0f5412453cca0
}
diff --git a/src/main/java/org/bukkit/plugin/SimplePluginManager.java b/src/main/java/org/bukkit/plugin/SimplePluginManager.java
index 42da20011544075a9bea63a12ae86f2f21720667..16d0e517afd3fae21f2666c6b4e1e38dcf5ea64b 100644
index bea2e464861771383f8fcf143fa817340cb8ab1d..cbda2ba8cb80d4f24cf4b4cd74c1fea6669273df 100644
--- a/src/main/java/org/bukkit/plugin/SimplePluginManager.java
+++ b/src/main/java/org/bukkit/plugin/SimplePluginManager.java
@@ -582,7 +582,9 @@ public final class SimplePluginManager implements PluginManager {
@@ -616,7 +616,9 @@ public final class SimplePluginManager implements PluginManager {
// Paper start
private void handlePluginException(String msg, Throwable ex, Plugin plugin) {
@@ -420,7 +422,7 @@ index 42da20011544075a9bea63a12ae86f2f21720667..16d0e517afd3fae21f2666c6b4e1e38d
callEvent(new ServerExceptionEvent(new ServerPluginEnableDisableException(msg, ex, plugin)));
}
// Paper end
@@ -641,9 +643,11 @@ public final class SimplePluginManager implements PluginManager {
@@ -675,9 +677,11 @@ public final class SimplePluginManager implements PluginManager {
));
}
} catch (Throwable ex) {