Repo-Mirror/Gale
9
0
Fork 0
mirror of https://github.com/Dreeam-qwq/Gale.git synced 2025-12-23 00:39:22 +00:00
Code Issues Releases Activity

Updated Upstream (Paper)

Browse Source
This commit is contained in:
Dreeam
2024-02-10 03:31:14 -05:00
parent 58e6ce0475
commit 29ff5f8515
14 changed files with 38 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
gradle.properties
View File

@@ -2,7 +2,7 @@ group=org.galemc.gale
version=1.20.4-R0.1-SNAPSHOT
mcVersion=1.20.4
paperRef=c5d168cef92148a6799141832fdb5f95732c1a38
paperRef=581fb30a4c80a8b10e41ddb0801747da53f57e62
org.gradle.caching=true
org.gradle.parallel=true

6
patches/server/0008-Gale-configuration.patch
View File

@@ -416,10 +416,10 @@ index 19f23a6c8fb5c02843c27fb8a242ec9d0d1b538b..c7abd433e70a6479fc81e5bce94144c9
this.world = new CraftWorld((ServerLevel) this, gen, biomeProvider, env);
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index f01064ddfc1e96fab1d9e42326eb537911102003..6b2632f5e3f01f3c8c350775595d8b77930bf15e 100644
index f8f7fcbd02005979436246d93584b1d003461868..0b7fb92aa1f61e04a6b6d75c12118dddf6941b75 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -1037,6 +1037,7 @@ public final class CraftServer implements Server {
@@ -1042,6 +1042,7 @@ public final class CraftServer implements Server {
org.spigotmc.SpigotConfig.init((File) this.console.options.valueOf("spigot-settings")); // Spigot
this.console.paperConfigurations.reloadConfigs(this.console);
@@ -427,7 +427,7 @@ index f01064ddfc1e96fab1d9e42326eb537911102003..6b2632f5e3f01f3c8c350775595d8b77
for (ServerLevel world : this.console.getAllLevels()) {
// world.serverLevelData.setDifficulty(config.difficulty); // Paper - per level difficulty
world.setSpawnSettings(world.serverLevelData.getDifficulty() != Difficulty.PEACEFUL && config.spawnMonsters, config.spawnAnimals); // Paper - per level difficulty (from MinecraftServer#setDifficulty(ServerLevel, Difficulty, boolean))
@@ -2996,6 +2997,14 @@ public final class CraftServer implements Server {
@@ -3001,6 +3002,14 @@ public final class CraftServer implements Server {
return CraftServer.this.console.paperConfigurations.createLegacyObject(CraftServer.this.console);
}

4
patches/server/0029-Print-stack-trace-for-plugins-not-shutting-down-task.patch
View File

@@ -31,10 +31,10 @@ You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index 8116b55cf34a97979d94494055bb67a651c9eeb3..67f0ca38ceae1e1485bc23fa862bb3f13de880a6 100644
index 0b7fb92aa1f61e04a6b6d75c12118dddf6941b75..2f6befd49bfc4daf96a8972167c3e0afc02c0fc6 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -1121,6 +1121,13 @@ public final class CraftServer implements Server {
@@ -1126,6 +1126,13 @@ public final class CraftServer implements Server {
plugin.getPluginMeta().getDisplayName(),
"This plugin is not properly shutting down its async tasks when it is being shut down. This task may throw errors during the final shutdown logs and might not complete before process dies."
));

4
patches/server/0044-Make-book-writing-configurable.patch
View File

@@ -22,7 +22,7 @@ you to easily disable books, should you want to preemptively remove this
functionality before additional exploits are found.
diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
index 2562ea3b63b055319a775c12ff327d127f8039c3..367392bffd0dc1d433ed44f7696bd5840b268157 100644
index a7e40f72a3b56916620a7f089410ec3a6db0cffc..6e531e52f9698bd6eb2311fc1ab63e394868d5a8 100644
--- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
+++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
@@ -186,6 +186,8 @@ import net.minecraft.world.phys.Vec3;
@@ -34,7 +34,7 @@ index 2562ea3b63b055319a775c12ff327d127f8039c3..367392bffd0dc1d433ed44f7696bd584
import org.slf4j.Logger;
// CraftBukkit start
@@ -1120,6 +1122,11 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
@@ -1139,6 +1141,11 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
@Override
public void handleEditBook(ServerboundEditBookPacket packet) {

6
patches/server/0054-Do-not-process-chat-commands-before-player-has-joine.patch
View File

@@ -13,7 +13,7 @@ As part of: EmpireCraft (https://github.com/starlis/empirecraft)
Licensed under: MIT (https://opensource.org/licenses/MIT)
diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
index e8ebc8588642479f22c6971bb2ea8ba557d9596a..932eb924a9d37130b53949d55c8d9e678900efd2 100644
index deb9a8931bbc6d8687d629fac9787361fc96aae6..06b9fdd33fe888d298dfd24a67702a610233f10d 100644
--- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
+++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
@@ -275,6 +275,7 @@ public class ServerPlayer extends Player {
@@ -25,10 +25,10 @@ index e8ebc8588642479f22c6971bb2ea8ba557d9596a..932eb924a9d37130b53949d55c8d9e67
public boolean isRealPlayer; // Paper
public final com.destroystokyo.paper.util.misc.PooledLinkedHashSets.PooledObjectLinkedOpenHashSet<ServerPlayer> cachedSingleHashSet; // Paper
diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
index 367392bffd0dc1d433ed44f7696bd5840b268157..38ea014943ade6e9cdbfd76fdfdbe4d8311d7fd8 100644
index 6e531e52f9698bd6eb2311fc1ab63e394868d5a8..f54f84c2206645fb86f8292dce0928b045bbe800 100644
--- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
+++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
@@ -2259,6 +2259,10 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
@@ -2278,6 +2278,10 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
if (this.player.isRemoved() || this.player.getChatVisibility() == ChatVisiblity.HIDDEN) { // CraftBukkit - dead men tell no tales
this.send(new ClientboundSystemChatPacket(Component.translatable("chat.disabled.options").withStyle(ChatFormatting.RED), false));
return Optional.empty();

4
patches/server/0056-Do-not-log-empty-message-warnings.patch
View File

@@ -7,7 +7,7 @@ License: GPL-3.0 (https://www.gnu.org/licenses/gpl-3.0.html)
Gale - https://galemc.org
diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
index 38ea014943ade6e9cdbfd76fdfdbe4d8311d7fd8..d79d53ddb5d46e8e44d5de9e904c4b872504baa3 100644
index f54f84c2206645fb86f8292dce0928b045bbe800..b00df400bdd20615997317aae873dcc94d8061af 100644
--- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
+++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
@@ -187,6 +187,7 @@ import net.minecraft.world.phys.shapes.BooleanOp;
@@ -18,7 +18,7 @@ index 38ea014943ade6e9cdbfd76fdfdbe4d8311d7fd8..d79d53ddb5d46e8e44d5de9e904c4b87
import org.galemc.gale.configuration.GaleGlobalConfiguration;
import org.slf4j.Logger;
@@ -2428,7 +2429,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
@@ -2447,7 +2448,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
// CraftBukkit start
String s = message.signedContent();
if (s.isEmpty()) {

12
patches/server/0080-Reduce-array-allocations.patch
View File

@@ -434,7 +434,7 @@ index 3fa891050ef7e62668ecdcf939d702db92514b23..e18764104c306de17ced824b96e163b2
return ret;
}
diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
index d79d53ddb5d46e8e44d5de9e904c4b872504baa3..27b6cb3672dbe3faf1b6815d22c21a983f95ef27 100644
index b00df400bdd20615997317aae873dcc94d8061af..331c71b8f8d1974f6cabb4f6602a62204d75790c 100644
--- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
+++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
@@ -28,6 +28,8 @@ import java.util.function.UnaryOperator;
@@ -617,10 +617,10 @@ index ef1cbbc1dc879d2fe981d6f45ef63fcdbd015257..49ed6ee2e64cf1a3b6914951a74a3a92
for (int j = 0; j < i; ++j) {
diff --git a/src/main/java/net/minecraft/world/entity/Mob.java b/src/main/java/net/minecraft/world/entity/Mob.java
index 684749248be7d3a258f84398fd6d0073eeb11a17..40edbefa9efaa897d203d4cf13ea796d6f35b965 100644
index 82383d25da1ffcd027d4f761c5b21079b66242ae..b2440bd7cfd060928ad0378c0ac7e2dc3b1114b4 100644
--- a/src/main/java/net/minecraft/world/entity/Mob.java
+++ b/src/main/java/net/minecraft/world/entity/Mob.java
@@ -1056,7 +1056,7 @@ public abstract class Mob extends LivingEntity implements Targeting {
@@ -1062,7 +1062,7 @@ public abstract class Mob extends LivingEntity implements Targeting {
@Override
protected void dropCustomDeathLoot(DamageSource source, int lootingMultiplier, boolean allowDrops) {
super.dropCustomDeathLoot(source, lootingMultiplier, allowDrops);
@@ -629,7 +629,7 @@ index 684749248be7d3a258f84398fd6d0073eeb11a17..40edbefa9efaa897d203d4cf13ea796d
int j = aenumitemslot.length;
for (int k = 0; k < j; ++k) {
@@ -1118,7 +1118,7 @@ public abstract class Mob extends LivingEntity implements Targeting {
@@ -1125,7 +1125,7 @@ public abstract class Mob extends LivingEntity implements Targeting {
}
boolean flag = true;
@@ -638,7 +638,7 @@ index 684749248be7d3a258f84398fd6d0073eeb11a17..40edbefa9efaa897d203d4cf13ea796d
int j = aenumitemslot.length;
for (int k = 0; k < j; ++k) {
@@ -1205,7 +1205,7 @@ public abstract class Mob extends LivingEntity implements Targeting {
@@ -1212,7 +1212,7 @@ public abstract class Mob extends LivingEntity implements Targeting {
float f = localDifficulty.getSpecialMultiplier();
this.enchantSpawnedWeapon(random, f);
@@ -647,7 +647,7 @@ index 684749248be7d3a258f84398fd6d0073eeb11a17..40edbefa9efaa897d203d4cf13ea796d
int i = aenumitemslot.length;
for (int j = 0; j < i; ++j) {
@@ -1424,7 +1424,7 @@ public abstract class Mob extends LivingEntity implements Targeting {
@@ -1431,7 +1431,7 @@ public abstract class Mob extends LivingEntity implements Targeting {
t0.setInvulnerable(this.isInvulnerable());
if (flag) {
t0.setCanPickUpLoot(this.canPickUpLoot());

6
patches/server/0081-Optimize-sun-burn-tick.patch
View File

@@ -13,7 +13,7 @@ As part of: JettPack (https://gitlab.com/Titaniumtown/JettPack)
Licensed under: GPL-3.0 (https://www.gnu.org/licenses/gpl-3.0.html)
diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
index a1cbb62b518d14a605bda2e9c5b0bd0289d84a60..81163774d783bfdefaf0031b589e8496ab0d3a92 100644
index dfe28fae791e402766ac18cac95ab99088d82467..1307c89b40138ed72d06a2d5596b67fdc3647090 100644
--- a/src/main/java/net/minecraft/world/entity/Entity.java
+++ b/src/main/java/net/minecraft/world/entity/Entity.java
@@ -307,7 +307,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S
@@ -45,10 +45,10 @@ index a1cbb62b518d14a605bda2e9c5b0bd0289d84a60..81163774d783bfdefaf0031b589e8496
this.absMoveTo(x, y, z);
this.setYRot(yaw % 360.0F);
diff --git a/src/main/java/net/minecraft/world/entity/Mob.java b/src/main/java/net/minecraft/world/entity/Mob.java
index 40edbefa9efaa897d203d4cf13ea796d6f35b965..d3a1af49024c7cd2854dc8a715450adc64aa083e 100644
index b2440bd7cfd060928ad0378c0ac7e2dc3b1114b4..86c3aaacc23df6404b6617fc61001fb5f94f4bad 100644
--- a/src/main/java/net/minecraft/world/entity/Mob.java
+++ b/src/main/java/net/minecraft/world/entity/Mob.java
@@ -1690,13 +1690,29 @@ public abstract class Mob extends LivingEntity implements Targeting {
@@ -1697,13 +1697,29 @@ public abstract class Mob extends LivingEntity implements Targeting {
}

4
patches/server/0112-Send-multiple-keep-alive-packets.patch
View File

@@ -129,7 +129,7 @@ index e7583996cc6d750cbd72f749de39ecded56d7f7c..d791c2f2facfc46d8664225c8b28f95f
}
diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
index 27b6cb3672dbe3faf1b6815d22c21a983f95ef27..647365c91d97613d79b08589b77d8a2b08d350b7 100644
index 331c71b8f8d1974f6cabb4f6602a62204d75790c..d42473b063130e6a2c0a480373712e10a2425660 100644
--- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
+++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
@@ -8,6 +8,8 @@ import com.mojang.brigadier.StringReader;
@@ -141,7 +141,7 @@ index 27b6cb3672dbe3faf1b6815d22c21a983f95ef27..647365c91d97613d79b08589b77d8a2b
import it.unimi.dsi.fastutil.objects.Object2ObjectOpenHashMap;
import it.unimi.dsi.fastutil.objects.ObjectIterator;
import java.net.SocketAddress;
@@ -3381,6 +3383,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
@@ -3400,6 +3402,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
}
@Override

6
patches/server/0114-Make-max-interaction-distance-configurable.patch
View File

@@ -20,7 +20,7 @@ index a7b217ddbcbf92513bd38101fdfca2075505e267..840dc3c57dd60d5f16155fc0c6f8c9fe
this.debugLogging(pos, false, sequence, "too far");
} else if (pos.getY() >= worldHeight) {
diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
index 647365c91d97613d79b08589b77d8a2b08d350b7..42b1188e236dd0facf5207ce2f1644a95b26da84 100644
index d42473b063130e6a2c0a480373712e10a2425660..2ac46efc317ddca2bdf8ba1c88bf9c9948715281 100644
--- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
+++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
@@ -250,7 +250,7 @@ import org.bukkit.inventory.SmithingInventory;
@@ -46,7 +46,7 @@ index 647365c91d97613d79b08589b77d8a2b08d350b7..42b1188e236dd0facf5207ce2f1644a9
@Override
public void tick() {
if (this.ackBlockChangesUpTo > -1) {
@@ -1913,7 +1920,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
@@ -1932,7 +1939,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
BlockPos blockposition = movingobjectpositionblock.getBlockPos();
Vec3 vec3d1 = Vec3.atCenterOf(blockposition);
@@ -55,7 +55,7 @@ index 647365c91d97613d79b08589b77d8a2b08d350b7..42b1188e236dd0facf5207ce2f1644a9
Vec3 vec3d2 = vec3d.subtract(vec3d1);
double d0 = 1.0000001D;
@@ -2701,7 +2708,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
@@ -2720,7 +2727,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
AABB axisalignedbb = entity.getBoundingBox();

8
patches/server/0123-CraftBukkit-UUID-to-world-map.patch
View File

@@ -13,7 +13,7 @@ As part of: MultiPaper (https://github.com/MultiPaper/MultiPaper)
Licensed under: GPL-3.0 (https://www.gnu.org/licenses/gpl-3.0.html)
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index 67f0ca38ceae1e1485bc23fa862bb3f13de880a6..df2d663ac85ec6b9c15e3bcd7ee4f2924deffd1e 100644
index 2f6befd49bfc4daf96a8972167c3e0afc02c0fc6..99aa56c7815e7f53a58680c098dddaca77d1e64a 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -43,6 +43,9 @@ import java.util.logging.Logger;
@@ -34,7 +34,7 @@ index 67f0ca38ceae1e1485bc23fa862bb3f13de880a6..df2d663ac85ec6b9c15e3bcd7ee4f292
private final Map<Class<?>, Registry<?>> registries = new HashMap<>();
private YamlConfiguration configuration;
private YamlConfiguration commandsConfiguration;
@@ -1447,6 +1451,7 @@ public final class CraftServer implements Server {
@@ -1452,6 +1456,7 @@ public final class CraftServer implements Server {
this.getLogger().log(Level.SEVERE, null, ex);
}
@@ -42,7 +42,7 @@ index 67f0ca38ceae1e1485bc23fa862bb3f13de880a6..df2d663ac85ec6b9c15e3bcd7ee4f292
this.worlds.remove(world.getName().toLowerCase(java.util.Locale.ENGLISH));
this.console.removeLevel(handle);
return true;
@@ -1465,12 +1470,7 @@ public final class CraftServer implements Server {
@@ -1470,12 +1475,7 @@ public final class CraftServer implements Server {
@Override
public World getWorld(UUID uid) {
@@ -56,7 +56,7 @@ index 67f0ca38ceae1e1485bc23fa862bb3f13de880a6..df2d663ac85ec6b9c15e3bcd7ee4f292
}
// Paper start
@@ -1488,6 +1488,7 @@ public final class CraftServer implements Server {
@@ -1493,6 +1493,7 @@ public final class CraftServer implements Server {
System.out.println("World " + world.getName() + " is a duplicate of another world and has been prevented from loading. Please delete the uid.dat file from " + world.getName() + "'s world directory if you want to be able to load the duplicate world.");
return;
}

4
patches/server/0125-Specific-interval-TPS-API.patch
View File

@@ -7,10 +7,10 @@ License: GPL-3.0 (https://www.gnu.org/licenses/gpl-3.0.html)
Gale - https://galemc.org
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index df2d663ac85ec6b9c15e3bcd7ee4f2924deffd1e..62de14156e7fd08e4a9d5acce1d0760c8e6186f9 100644
index 99aa56c7815e7f53a58680c098dddaca77d1e64a..121547a0988d278e82d37f389111910266655e54 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -3048,6 +3048,24 @@ public final class CraftServer implements Server {
@@ -3053,6 +3053,24 @@ public final class CraftServer implements Server {
};
}

6
patches/server/0126-5-second-TPS-average.patch
View File

@@ -59,7 +59,7 @@ index 039a86034928a5eb7aaa2d7ca76a7bddcca346bd..7c32c60100cf2bd109eb8762efa856c1
}
diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
index 377cf883f6a78d3d2ccbbcae451d1358295b20c8..3f7be2c6c95f23e7ea1b03d4083e93c920ccdcf7 100644
index 6f3d488fda697299f604e813b8eaa06ed9de828f..c8f751ab99e7c9995f1d45193c9e9ddf52b944c1 100644
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
@@ -1055,6 +1055,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@@ -79,10 +79,10 @@ index 377cf883f6a78d3d2ccbbcae451d1358295b20c8..3f7be2c6c95f23e7ea1b03d4083e93c9
tps5.add(currentTps, diff);
tps15.add(currentTps, diff);
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index 62de14156e7fd08e4a9d5acce1d0760c8e6186f9..e999d954d72d8061468981213a92ea046b94558a 100644
index 121547a0988d278e82d37f389111910266655e54..6133edb88719bd155155ec87ac600321a2a8392f 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -3048,8 +3048,27 @@ public final class CraftServer implements Server {
@@ -3053,8 +3053,27 @@ public final class CraftServer implements Server {
};
}

4
patches/server/0128-Last-tick-time-API.patch
View File

@@ -23,10 +23,10 @@ The above copyright notice and this permission notice shall be included in all c
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index e999d954d72d8061468981213a92ea046b94558a..f07b78249abb95b1d1d279831e48ebac2715a755 100644
index 6133edb88719bd155155ec87ac600321a2a8392f..a75fc8e2ed955c107518651bba2f17d1e552b4b5 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -3281,4 +3281,22 @@ public final class CraftServer implements Server {
@@ -3286,4 +3286,22 @@ public final class CraftServer implements Server {
}
// Paper end