Skip to content
This repository has been archived by the owner on Apr 21, 2023. It is now read-only.

Commit

Permalink
[CI-Skip] move
Browse files Browse the repository at this point in the history
  • Loading branch information
AlphaKR93 committed Nov 12, 2022
1 parent 8a71df5 commit 9d30edf
Show file tree
Hide file tree
Showing 2 changed files with 14 additions and 27 deletions.
16 changes: 14 additions & 2 deletions patches/server/0014-Miscellaneous-patches.patch
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ Subject: [PATCH] Miscellaneous patches


diff --git a/src/main/java/gg/pufferfish/pufferfish/PufferfishConfig.java b/src/main/java/gg/pufferfish/pufferfish/PufferfishConfig.java
index 7b34c1b859e5fdc8487e202f87a76f490382ce07..5e10c6876eb076b42e82f2c5442ab63c23a95711 100644
index 7b34c1b859e5fdc8487e202f87a76f490382ce07..82ae8c6e0509a54ebf9226a879db6648a6a4bbe5 100644
--- a/src/main/java/gg/pufferfish/pufferfish/PufferfishConfig.java
+++ b/src/main/java/gg/pufferfish/pufferfish/PufferfishConfig.java
@@ -95,13 +95,14 @@ public class PufferfishConfig {
Expand All @@ -21,7 +21,7 @@ index 7b34c1b859e5fdc8487e202f87a76f490382ce07..5e10c6876eb076b42e82f2c5442ab63c
} else if (SIMDDetection.versionLimited) {
- PufferfishLogger.LOGGER.warning("Will not enable SIMD! These optimizations are only safely supported on Java 17 and Java 18.");
+ PufferfishLogger.LOGGER.warning("Will not enable SIMD! These optimizations are only safely supported on Java 17, 18 and 19."); // Prismarine
+ PufferfishLogger.LOGGER.warning("If you really want to enable them, add \"-DPrismarine.SkipSIMDJavaVersionCheck=true\" to your startup flags, BEFORE the \"-jar\"."); // Prismarine
+ PufferfishLogger.LOGGER.warning("If you really want to enable them, add \"-DPrismarine.SkipSIMDJavaVersionCheck=true\" to your startup flags, BETWEEN the \"-jar\" and *server file name*."); // Prismarine
} else {
PufferfishLogger.LOGGER.warning("SIMD operations are available for your server, but are not configured!");
PufferfishLogger.LOGGER.warning("To enable additional optimizations, add \"--add-modules=jdk.incubator.vector\" to your startup flags, BEFORE the \"-jar\".");
Expand Down Expand Up @@ -230,6 +230,18 @@ index 3eee2ebaee415cde427eb72f61a3c67ed5cc0e30..97115c2c5fdbea7f73b2eb81093dfae6
}
}

diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index 6e5e964917bf9d04935badf05dc2191988251656..a536c9ffdf191610e4c6f0fe4fde0a142e5f5003 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -460,6 +460,7 @@ public final class CraftServer implements Server {
}

extraJars.add(file);
+ getLogger().info("Purpur: Spark has been downloaded and installed. If you really don't want to use Spark, add \"-DPurpur.IReallyDontWantSpark=true\" to your startup flags, BETWEEN the \"-jar\" and *server file name*.");
} catch (Exception e) {
getLogger().severe("Purpur: Failed to download and install spark plugin");
e.printStackTrace();
diff --git a/src/main/java/org/purpurmc/purpur/PurpurConfig.java b/src/main/java/org/purpurmc/purpur/PurpurConfig.java
index 0797dbf646550aa34b2b5d3fe9ab676740dfaf44..8dfd4f3a008c9f8b677cf60da5c9dc53be947ebb 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurConfig.java
Expand Down
25 changes: 0 additions & 25 deletions patches/server/0015-EntityBreedPrepareEvent.patch
Original file line number Diff line number Diff line change
Expand Up @@ -4,19 +4,6 @@ Date: Sun, 24 Apr 2022 18:25:04 +0900
Subject: [PATCH] EntityBreedPrepareEvent


diff --git a/src/main/java/gg/pufferfish/pufferfish/PufferfishConfig.java b/src/main/java/gg/pufferfish/pufferfish/PufferfishConfig.java
index 5e10c6876eb076b42e82f2c5442ab63c23a95711..82ae8c6e0509a54ebf9226a879db6648a6a4bbe5 100644
--- a/src/main/java/gg/pufferfish/pufferfish/PufferfishConfig.java
+++ b/src/main/java/gg/pufferfish/pufferfish/PufferfishConfig.java
@@ -102,7 +102,7 @@ public class PufferfishConfig {
PufferfishLogger.LOGGER.info("SIMD operations detected as functional. Will replace some operations with faster versions.");
} else if (SIMDDetection.versionLimited) {
PufferfishLogger.LOGGER.warning("Will not enable SIMD! These optimizations are only safely supported on Java 17, 18 and 19."); // Prismarine
- PufferfishLogger.LOGGER.warning("If you really want to enable them, add \"-DPrismarine.SkipSIMDJavaVersionCheck=true\" to your startup flags, BEFORE the \"-jar\"."); // Prismarine
+ PufferfishLogger.LOGGER.warning("If you really want to enable them, add \"-DPrismarine.SkipSIMDJavaVersionCheck=true\" to your startup flags, BETWEEN the \"-jar\" and *server file name*."); // Prismarine
} else {
PufferfishLogger.LOGGER.warning("SIMD operations are available for your server, but are not configured!");
PufferfishLogger.LOGGER.warning("To enable additional optimizations, add \"--add-modules=jdk.incubator.vector\" to your startup flags, BEFORE the \"-jar\".");
diff --git a/src/main/java/net/minecraft/world/entity/ai/goal/BreedGoal.java b/src/main/java/net/minecraft/world/entity/ai/goal/BreedGoal.java
index d037595b71511814caac0a40eb8d37ef35264cd2..6902fbf6657e41e1d784be94e9b44806bee7ca31 100644
--- a/src/main/java/net/minecraft/world/entity/ai/goal/BreedGoal.java
Expand All @@ -39,15 +26,3 @@ index d037595b71511814caac0a40eb8d37ef35264cd2..6902fbf6657e41e1d784be94e9b44806
this.animal.getLookControl().setLookAt(this.partner, 10.0F, (float)this.animal.getMaxHeadXRot());
this.animal.getNavigation().moveTo(this.partner, this.speedModifier);
++this.loveTime;
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index 6e5e964917bf9d04935badf05dc2191988251656..a536c9ffdf191610e4c6f0fe4fde0a142e5f5003 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -460,6 +460,7 @@ public final class CraftServer implements Server {
}

extraJars.add(file);
+ getLogger().info("Purpur: Spark has been downloaded and installed. If you really don't want to use Spark, add \"-DPurpur.IReallyDontWantSpark=true\" to your startup flags, BETWEEN the \"-jar\" and *server file name*.");
} catch (Exception e) {
getLogger().severe("Purpur: Failed to download and install spark plugin");
e.printStackTrace();

0 comments on commit 9d30edf

Please sign in to comment.