Skip to content

Commit 4588da4

Browse files
committed
Fix floodgate compatibility
1 parent 5fd2c6b commit 4588da4

File tree

2 files changed

+42
-20
lines changed

2 files changed

+42
-20
lines changed

patches/server/0159-refactor-to-beast.patch

+23-20
Original file line numberDiff line numberDiff line change
@@ -447,6 +447,29 @@ index bd202ae956d0a0f96cc38d0c5c99e405e106d256..17dda7a400e311e6524e388d4ff6b216
447447
}
448448

449449
public int compareTo(BaseBlockPosition object) { // Paper - decompile fix
450+
diff --git a/src/main/java/net/minecraft/server/ReaperLightingQueue.java b/src/main/java/net/minecraft/server/BeastLightingQueue.java
451+
similarity index 98%
452+
rename from src/main/java/net/minecraft/server/ReaperLightingQueue.java
453+
rename to src/main/java/net/minecraft/server/BeastLightingQueue.java
454+
index 040069f8be82064d05bb337d8aa976fbcc470b3c..a481302b850a9a3ca95bfc5abb1c14fd71b62ba7 100644
455+
--- a/src/main/java/net/minecraft/server/ReaperLightingQueue.java
456+
+++ b/src/main/java/net/minecraft/server/BeastLightingQueue.java
457+
@@ -1,13 +1,13 @@
458+
package net.minecraft.server;
459+
460+
-import com.github.ruviolence.reaper.BeastConfig;
461+
+import com.homomc.beast.BeastConfig;
462+
import it.unimi.dsi.fastutil.longs.Long2ObjectMap;
463+
import it.unimi.dsi.fastutil.longs.Long2ObjectOpenHashMap;
464+
import it.unimi.dsi.fastutil.objects.ObjectCollection;
465+
466+
import java.util.ArrayDeque;
467+
468+
-public class ReaperLightingQueue {
469+
+public class BeastLightingQueue {
470+
private static final long MAX_TIME = (long) (1000000000 / 20 * 1.15);
471+
472+
public static void processQueue(long curTime) {
450473
diff --git a/src/main/java/net/minecraft/server/BiomeForest.java b/src/main/java/net/minecraft/server/BiomeForest.java
451474
index 744d71350950a562353a0a0ab8be2c2a6075e38b..671ddc130236d36e174758d9647650f354bd5253 100644
452475
--- a/src/main/java/net/minecraft/server/BiomeForest.java
@@ -16102,26 +16125,6 @@ index 70c5d42b3b601429392da4c878a5f828017b0ea9..c5a5a90b62963bb99dd42b7eea7a6afc
1610216125
a("strong_regeneration", new PotionRegistry("regeneration", new MobEffect[] { new MobEffect(MobEffects.REGENERATION, 450, 1)}));
1610316126
a("strength", new PotionRegistry(new MobEffect[] { new MobEffect(MobEffects.INCREASE_DAMAGE, 3600)}));
1610416127
a("long_strength", new PotionRegistry("strength", new MobEffect[] { new MobEffect(MobEffects.INCREASE_DAMAGE, 9600)}));
16105-
diff --git a/src/main/java/net/minecraft/server/ReaperLightingQueue.java b/src/main/java/net/minecraft/server/ReaperLightingQueue.java
16106-
index 040069f8be82064d05bb337d8aa976fbcc470b3c..a481302b850a9a3ca95bfc5abb1c14fd71b62ba7 100644
16107-
--- a/src/main/java/net/minecraft/server/ReaperLightingQueue.java
16108-
+++ b/src/main/java/net/minecraft/server/BeastLightingQueue.java
16109-
@@ -1,13 +1,13 @@
16110-
package net.minecraft.server;
16111-
16112-
-import com.github.ruviolence.reaper.BeastConfig;
16113-
+import com.homomc.beast.BeastConfig;
16114-
import it.unimi.dsi.fastutil.longs.Long2ObjectMap;
16115-
import it.unimi.dsi.fastutil.longs.Long2ObjectOpenHashMap;
16116-
import it.unimi.dsi.fastutil.objects.ObjectCollection;
16117-
16118-
import java.util.ArrayDeque;
16119-
16120-
-public class ReaperLightingQueue {
16121-
+public class BeastLightingQueue {
16122-
private static final long MAX_TIME = (long) (1000000000 / 20 * 1.15);
16123-
16124-
public static void processQueue(long curTime) {
1612516128
diff --git a/src/main/java/net/minecraft/server/RecipeFireworks.java b/src/main/java/net/minecraft/server/RecipeFireworks.java
1612616129
index f33c7601e5a9f8690be3c5509eaf3e86286cc448..41b82d93eb4c6665bfa39b3bb873d7219c68651f 100644
1612716130
--- a/src/main/java/net/minecraft/server/RecipeFireworks.java
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
2+
From: HaHaWTH <id_cn00@outlook.com>
3+
Date: Fri, 5 Apr 2024 17:21:20 +0800
4+
Subject: [PATCH] Fix-compatibility
5+
6+
7+
diff --git a/src/main/java/io/papermc/paper/configuration/GlobalConfiguration.java b/src/main/java/io/papermc/paper/configuration/GlobalConfiguration.java
8+
deleted file mode 100644
9+
index 8596b4f2f68c87fa6f6fe0e78a0bb0231ed1fc1a..0000000000000000000000000000000000000000
10+
--- a/src/main/java/io/papermc/paper/configuration/GlobalConfiguration.java
11+
+++ /dev/null
12+
@@ -1,7 +0,0 @@
13+
-package io.papermc.paper.configuration;
14+
-
15+
-public class GlobalConfiguration {
16+
- public class PacketLimiter {
17+
- // Beast - This is just a dummy class to prevent ViaVersion from enabling its packet limiter.
18+
- }
19+
-}

0 commit comments

Comments
 (0)