Repo-Mirror/LeavesMC
9
0
Fork 0
mirror of https://github.com/LeavesMC/Leaves.git synced 2025-12-19 14:59:32 +00:00
Code Issues Releases Activity

Update 1.19

Browse Source
This commit is contained in:
violetc
2022-06-14 07:49:46 +00:00
parent 9fcc2e20be
commit 0e8ee0cfb8
12 changed files with 96 additions and 122 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
build.gradle.kts
View File

@@ -1,7 +1,7 @@
plugins {
java
id("com.github.johnrengelman.shadow") version "7.1.2" apply false
id("io.papermc.paperweight.patcher") version "1.3.6"
id("io.papermc.paperweight.patcher") version "1.3.7"
}
repositories {

8
gradle.properties
View File

@@ -1,7 +1,7 @@
group = top.leavesmc.leaves
version = 1.18.2-R0.1-SNAPSHOT
version = 1.19-R0.1-SNAPSHOT
mcVersion = 1.18.2
packageVersion = 1_18_R2
mcVersion = 1.19
packageVersion = 1_18_R0
org.gradle.jvmargs=-Xmx2G
paperRef=276d830d223ddf68611beacc248285ae5a4e8a1f
paperRef=3d37b42a89db7af2dd367861fa66c28b9e4aae97

20
patches/server/0001-Build-changes.patch
View File

@@ -5,7 +5,7 @@ Subject: [PATCH] Build changes
diff --git a/build.gradle.kts b/build.gradle.kts
index 0282e3b75470e1a68ea1fc228082483514ba432e..8e4d7a1a5828450a3f3bb77c84929f40c909476d 100644
index 68b8f275f9c9e77a949ca29749a05b469bcdb910..09cee4768d49615bf802e8cd74cefb5d86e1736c 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -9,8 +9,12 @@ plugins {
@@ -23,7 +23,7 @@ index 0282e3b75470e1a68ea1fc228082483514ba432e..8e4d7a1a5828450a3f3bb77c84929f40
// Paper start
implementation("org.jline:jline-terminal-jansi:3.21.0")
implementation("net.minecrell:terminalconsoleappender:1.3.0")
@@ -54,13 +58,13 @@ tasks.jar {
@@ -58,13 +62,13 @@ tasks.jar {
manifest {
val git = Git(rootProject.layout.projectDirectory.path)
val gitHash = git("rev-parse", "--short=7", "HEAD").getText().trim()
@@ -39,7 +39,7 @@ index 0282e3b75470e1a68ea1fc228082483514ba432e..8e4d7a1a5828450a3f3bb77c84929f40
"Implementation-Vendor" to date, // Paper
"Specification-Title" to "Bukkit",
"Specification-Version" to project.version,
@@ -148,7 +152,7 @@ fun TaskContainer.registerRunTask(
@@ -152,7 +156,7 @@ fun TaskContainer.registerRunTask(
name: String,
block: JavaExec.() -> Unit
): TaskProvider<JavaExec> = register<JavaExec>(name) {
@@ -49,7 +49,7 @@ index 0282e3b75470e1a68ea1fc228082483514ba432e..8e4d7a1a5828450a3f3bb77c84929f40
standardInput = System.`in`
workingDir = rootProject.layout.projectDirectory
diff --git a/src/main/java/com/destroystokyo/paper/Metrics.java b/src/main/java/com/destroystokyo/paper/Metrics.java
index 218f5bafeed8551b55b91c7fccaf6935c8b631ca..6105f3bdc6e698b07181b10aec58822564af2a43 100644
index 7b1843e16745ca8db2244e17490d291401f22679..0ac8bcb0a4b7d1da3d0e016617db7a81ce9acead 100644
--- a/src/main/java/com/destroystokyo/paper/Metrics.java
+++ b/src/main/java/com/destroystokyo/paper/Metrics.java
@@ -593,7 +593,7 @@ public class Metrics {
@@ -71,10 +71,10 @@ index 218f5bafeed8551b55b91c7fccaf6935c8b631ca..6105f3bdc6e698b07181b10aec588225
metrics.addCustomChart(new Metrics.DrilldownPie("java_version", () -> {
Map<String, Map<String, Integer>> map = new HashMap<>();
diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
index da15a224b8b974e78b9d8d5f514229b3b2a5a63e..743cb6da2e21c5f7663f6f87ec4fe94c97d4e6fd 100644
index 32dc0cd20a4dd8fc02be1f7ba3d727db826dbe5d..33e9e84fe6c36e3b4b83aec6274a73e0ee3afdcb 100644
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
@@ -1696,7 +1696,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@@ -1654,7 +1654,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@DontObfuscate
public String getServerModName() {
@@ -84,10 +84,10 @@ index da15a224b8b974e78b9d8d5f514229b3b2a5a63e..743cb6da2e21c5f7663f6f87ec4fe94c
public SystemReport fillSystemReport(SystemReport details) {
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index 8a248e34fce1e04de4460f98b7627df495c66af1..9387f8a9996d86abfc5fea354108c446fa859228 100644
index f1e5ccfbcd08a73ac3aba9a1cb7b414faef81f9e..2ed922a100bfdf4500aef6b6b0d8c61bba6a4bdc 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -249,7 +249,7 @@ import javax.annotation.Nullable; // Paper
@@ -243,7 +243,7 @@ import javax.annotation.Nullable; // Paper
import javax.annotation.Nonnull; // Paper
public final class CraftServer implements Server {
@@ -97,10 +97,10 @@ index 8a248e34fce1e04de4460f98b7627df495c66af1..9387f8a9996d86abfc5fea354108c446
private final String bukkitVersion = Versioning.getBukkitVersion();
private final Logger logger = Logger.getLogger("Minecraft");
diff --git a/src/main/java/org/bukkit/craftbukkit/Main.java b/src/main/java/org/bukkit/craftbukkit/Main.java
index fbe68bd4739d9a0e7d9bc4c3d5ba8ecfd2d13954..e12d2710c5d7481c740434e483637b6d8d4ff8a1 100644
index fbd604602024522bdd73aa1bde6fe2ccec63e442..af3c2f1c6ab4ee3e5bac42f4842a2af459c042a2 100644
--- a/src/main/java/org/bukkit/craftbukkit/Main.java
+++ b/src/main/java/org/bukkit/craftbukkit/Main.java
@@ -265,7 +265,7 @@ public class Main {
@@ -270,7 +270,7 @@ public class Main {
if (buildDate.before(deadline.getTime())) {
// Paper start - This is some stupid bullshit
System.err.println("*** Warning, you've not updated in a while! ***");

60
patches/server/0003-Leaves-Server-Config.patch
View File

@@ -5,10 +5,10 @@ Subject: [PATCH] Leaves Server Config
diff --git a/src/main/java/co/aikar/timings/TimingsExport.java b/src/main/java/co/aikar/timings/TimingsExport.java
index f3bf9df8c0bd56cad461210ce8551ade3a220b6b..d9c6247583990390cfdbe435cb9ad4a08f389d6f 100644
index 06bff37e4c1fddd3be6343049a66787c63fb420c..15ed5a9af5583e2430804662e3b9fa95862f64d0 100644
--- a/src/main/java/co/aikar/timings/TimingsExport.java
+++ b/src/main/java/co/aikar/timings/TimingsExport.java
@@ -240,7 +240,8 @@ public class TimingsExport extends Thread {
@@ -241,7 +241,8 @@ public class TimingsExport extends Thread {
parent.put("config", createObject(
pair("spigot", mapAsJSON(Bukkit.spigot().getSpigotConfig(), null)),
pair("bukkit", mapAsJSON(Bukkit.spigot().getBukkitConfig(), null)),
@@ -19,25 +19,23 @@ index f3bf9df8c0bd56cad461210ce8551ade3a220b6b..d9c6247583990390cfdbe435cb9ad4a0
new TimingsExport(listeners, parent, history).start();
diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
index 743cb6da2e21c5f7663f6f87ec4fe94c97d4e6fd..28d1199dc731a5baf8bb05cb517111c6adda559c 100644
index 33e9e84fe6c36e3b4b83aec6274a73e0ee3afdcb..4ce66a6d57ecc586f67679b15d14436d574cdd95 100644
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
@@ -1178,7 +1178,8 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
String doneTime = String.format(java.util.Locale.ROOT, "%.3fs", (double) (Util.getNanos() - serverStartTime) / 1.0E9D);
LOGGER.info("Done ({})! For help, type \"help\"", doneTime);
// Paper end
-
+
+ top.leavesmc.leaves.LeavesConfig.createWorldSections = false; // Leaves - dont let plugin create worlds fill our config
org.spigotmc.WatchdogThread.tick(); // Paper
org.spigotmc.WatchdogThread.hasStarted = true; // Paper
Arrays.fill( recentTps, 20 );
@@ -1140,6 +1140,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
LOGGER.info("Done ({})! For help, type \"help\"", doneTime);
// Paper end
+ top.leavesmc.leaves.LeavesConfig.createWorldSections = false; // Leaves - dont let plugin create worlds fill our config
org.spigotmc.WatchdogThread.tick(); // Paper
org.spigotmc.WatchdogThread.hasStarted = true; // Paper
Arrays.fill( recentTps, 20 );
diff --git a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
index 257c94f7c1cb00c9a91ab82e311dfd8eca29c538..705797683bea7b29a873f01ddb99496f1a17eb40 100644
index aea18838a17fc52e1bf8cd84cd185565e6e2246d..2294294bd192d380d99189a1884db7f2be885d04 100644
--- a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
+++ b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
@@ -235,6 +235,8 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface
io.papermc.paper.util.ObfHelper.INSTANCE.getClass(); // load mappings for stacktrace deobf and etc.
@@ -226,6 +226,8 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface
com.destroystokyo.paper.VersionHistoryManager.INSTANCE.getClass(); // load version history now
io.papermc.paper.brigadier.PaperBrigadierProviderImpl.INSTANCE.getClass(); // init PaperBrigadierProvider
// Paper end
+
@@ -46,49 +44,49 @@ index 257c94f7c1cb00c9a91ab82e311dfd8eca29c538..705797683bea7b29a873f01ddb99496f
this.setPvpAllowed(dedicatedserverproperties.pvp);
this.setFlightAllowed(dedicatedserverproperties.allowFlight);
diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java
index fee8996f35b38fd79946cdfd677763e0201eb57d..a06c329c15769af2cd6bf0ad1e1d73f80e2b37a7 100644
index d59dea221ba0f1b9c14f403d3c6ea61b2c454316..f15a1025c9edb4de8bfdfd9b0109e616edb20cbb 100644
--- a/src/main/java/net/minecraft/world/level/Level.java
+++ b/src/main/java/net/minecraft/world/level/Level.java
@@ -163,6 +163,8 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
@@ -174,6 +174,8 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
// Paper end
public final com.destroystokyo.paper.PaperWorldConfig paperConfig; // Paper
public final com.destroystokyo.paper.antixray.ChunkPacketBlockController chunkPacketBlockController; // Paper - Anti-Xray
+
+ public final top.leavesmc.leaves.LeavesConfig.WorldConfig leavesConfig; // Leaves - World Config
public final co.aikar.timings.WorldTimingsHandler timings; // Paper
public static BlockPos lastPhysicsProblem; // Spigot
@@ -264,6 +266,7 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
protected Level(WritableLevelData worlddatamutable, ResourceKey<Level> resourcekey, Holder<DimensionType> holder, Supplier<ProfilerFiller> supplier, boolean flag, boolean flag1, long i, org.bukkit.generator.ChunkGenerator gen, org.bukkit.generator.BiomeProvider biomeProvider, org.bukkit.World.Environment env, java.util.concurrent.Executor executor) { // Paper - Async-Anti-Xray - Pass executor
@@ -275,6 +277,7 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
protected Level(WritableLevelData worlddatamutable, ResourceKey<Level> resourcekey, Holder<DimensionType> holder, Supplier<ProfilerFiller> supplier, boolean flag, boolean flag1, long i, int j, org.bukkit.generator.ChunkGenerator gen, org.bukkit.generator.BiomeProvider biomeProvider, org.bukkit.World.Environment env, java.util.function.Function<org.spigotmc.SpigotWorldConfig, io.papermc.paper.configuration.WorldConfiguration> paperWorldConfigCreator, java.util.concurrent.Executor executor) { // Paper - Async-Anti-Xray - Pass executor
this.spigotConfig = new org.spigotmc.SpigotWorldConfig(((net.minecraft.world.level.storage.PrimaryLevelData) worlddatamutable).getLevelName()); // Spigot
this.paperConfig = new com.destroystokyo.paper.PaperWorldConfig(((net.minecraft.world.level.storage.PrimaryLevelData) worlddatamutable).getLevelName(), this.spigotConfig); // Paper
this.paperConfig = paperWorldConfigCreator.apply(this.spigotConfig); // Paper
+ this.leavesConfig = new top.leavesmc.leaves.LeavesConfig.WorldConfig(((net.minecraft.world.level.storage.PrimaryLevelData)worlddatamutable).getLevelName()); // Leaves - World Config
this.generator = gen;
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 9387f8a9996d86abfc5fea354108c446fa859228..57edab91d0f807208ebbe1dd7f07fcc50b86814b 100644
index 2ed922a100bfdf4500aef6b6b0d8c61bba6a4bdc..a3adc71d859fd34f57af9cae970356e1af268c69 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -956,6 +956,7 @@ public final class CraftServer implements Server {
@@ -950,6 +950,7 @@ public final class CraftServer implements Server {
org.spigotmc.SpigotConfig.init((File) console.options.valueOf("spigot-settings")); // Spigot
com.destroystokyo.paper.PaperConfig.init((File) console.options.valueOf("paper-settings")); // Paper
this.console.paperConfigurations.reloadConfigs(this.console);
+ top.leavesmc.leaves.LeavesConfig.init((File) console.options.valueOf("leaves-settings")); // Leaves - Server Config
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))
@@ -972,6 +973,7 @@ public final class CraftServer implements Server {
@@ -965,6 +966,7 @@ public final class CraftServer implements Server {
}
}
world.spigotConfig.init(); // Spigot
world.paperConfig.init(); // Paper
+ world.leavesConfig.init(); // Leaves - World Config
}
Plugin[] pluginClone = pluginManager.getPlugins().clone(); // Paper
@@ -2713,6 +2715,14 @@ public final class CraftServer implements Server {
@@ -2693,6 +2695,14 @@ public final class CraftServer implements Server {
{
return com.destroystokyo.paper.PaperConfig.config;
return CraftServer.this.console.paperConfigurations.createLegacyObject(CraftServer.this.console);
}
+
+ // Leaves start - add config to timings report
@@ -102,10 +100,10 @@ index 9387f8a9996d86abfc5fea354108c446fa859228..57edab91d0f807208ebbe1dd7f07fcc5
@Override
public void restart() {
diff --git a/src/main/java/org/bukkit/craftbukkit/Main.java b/src/main/java/org/bukkit/craftbukkit/Main.java
index e12d2710c5d7481c740434e483637b6d8d4ff8a1..fc3946d6243e72184773a45bc1eca640ba4595ae 100644
index af3c2f1c6ab4ee3e5bac42f4842a2af459c042a2..67b19398ca125ef5ae9a6eefdf4399f9c6ce0dc0 100644
--- a/src/main/java/org/bukkit/craftbukkit/Main.java
+++ b/src/main/java/org/bukkit/craftbukkit/Main.java
@@ -145,6 +145,14 @@ public class Main {
@@ -150,6 +150,14 @@ public class Main {
.ofType(File.class)
.defaultsTo(new File("paper.yml"))
.describedAs("Yml file");

12
patches/server/0004-Fix-gravity-block-duper.patch
View File

@@ -5,10 +5,10 @@ Subject: [PATCH] Fix gravity block duper
diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
index dfd1f37757af1bd808cc2e2d8bf97123adf638bb..3992f9de087ee63b035fc11f712bb1af5aa7ddbf 100644
index 89cecb3603b41ae22efc54a9f2858a6f60e52148..afaea35a466f90d509e90393b50730ea51c75cfc 100644
--- a/src/main/java/net/minecraft/world/entity/Entity.java
+++ b/src/main/java/net/minecraft/world/entity/Entity.java
@@ -398,36 +398,8 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
@@ -454,36 +454,8 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
return chunkMap.playerEntityTrackerTrackMaps[type.ordinal()].getObjectsInRange(MCUtil.getCoordinateKey(this));
}
// Paper end - optimise entity tracking
@@ -46,7 +46,7 @@ index dfd1f37757af1bd808cc2e2d8bf97123adf638bb..3992f9de087ee63b035fc11f712bb1af
// Paper start
/**
@@ -2782,7 +2754,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
@@ -2865,7 +2837,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
}
this.processPortalCooldown();
@@ -56,7 +56,7 @@ index dfd1f37757af1bd808cc2e2d8bf97123adf638bb..3992f9de087ee63b035fc11f712bb1af
}
diff --git a/src/main/java/net/minecraft/world/entity/item/FallingBlockEntity.java b/src/main/java/net/minecraft/world/entity/item/FallingBlockEntity.java
index 318ea6ebf4c13a984b3815f00bf6cb3856ff6fe0..073407f76c98e8d4859a21f3249dbd12b1d34382 100644
index ef07967b64180c54338b8fb2ba1780adec87f333..89a0d314786477f580ab5554d6d2526c9a43d662 100644
--- a/src/main/java/net/minecraft/world/entity/item/FallingBlockEntity.java
+++ b/src/main/java/net/minecraft/world/entity/item/FallingBlockEntity.java
@@ -127,11 +127,7 @@ public class FallingBlockEntity extends Entity {
@@ -84,9 +84,9 @@ index 318ea6ebf4c13a984b3815f00bf6cb3856ff6fe0..073407f76c98e8d4859a21f3249dbd12
+ // Leaves - fix gravity block duper
// Paper start - Configurable EntityFallingBlock height nerf
if (this.level.paperConfig.fallingBlockHeightNerf != 0 && this.getY() > this.level.paperConfig.fallingBlockHeightNerf) {
if (this.level.paperConfig().fixes.fallingBlockHeightNerf != 0 && this.getY() > this.level.paperConfig().fixes.fallingBlockHeightNerf) {
diff --git a/src/main/java/net/minecraft/world/level/block/EndPortalBlock.java b/src/main/java/net/minecraft/world/level/block/EndPortalBlock.java
index 19892cb3cb290add4f094dc87bb22106e4f07a24..e2172172019af22b3474456b6d6cc6bd3ff4351a 100644
index 15c5cccfe02c924c02f605eb47dd0b420b189891..d3b286e145c7eda30f3e2419d20feee107a4f42f 100644
--- a/src/main/java/net/minecraft/world/level/block/EndPortalBlock.java
+++ b/src/main/java/net/minecraft/world/level/block/EndPortalBlock.java
@@ -53,12 +53,19 @@ public class EndPortalBlock extends BaseEntityBlock {

4
patches/server/0005-Fix-trading-with-the-void.patch
View File

@@ -5,10 +5,10 @@ Subject: [PATCH] Fix trading with the void
diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
index 98209532ad3e692d7e459640123f78bbd9a65889..aa96174d69c37327673d31da6ba1ff199505641d 100644
index 0dc7a827aeacc7fae53b1f975f45883da7db6a0c..66fa668e15607984c4a9359400e823d5802a1fd3 100644
--- a/src/main/java/net/minecraft/server/level/ServerLevel.java
+++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
@@ -2518,11 +2518,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
@@ -2599,11 +2599,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
// Spigot end
// Spigot Start
if (entity.getBukkitEntity() instanceof org.bukkit.inventory.InventoryHolder && (!(entity instanceof ServerPlayer) || entity.getRemovalReason() != Entity.RemovalReason.KILLED)) { // SPIGOT-6876: closeInventory clears death message

10
patches/server/0008-Add-Leaves-Command.patch
View File

@@ -5,10 +5,10 @@ Subject: [PATCH] Add Leaves Command
diff --git a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
index 705797683bea7b29a873f01ddb99496f1a17eb40..dddbbdf2a5b3f7e28253c88b307ad42ca7f6b36b 100644
index 2294294bd192d380d99189a1884db7f2be885d04..026d79fb66cf96883a28e7a33707fb3116f80ab9 100644
--- a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
+++ b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
@@ -237,6 +237,7 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface
@@ -228,6 +228,7 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface
// Paper end
top.leavesmc.leaves.LeavesConfig.init((java.io.File) options.valueOf("leaves-settings")); // Leaves - Server Config
@@ -17,13 +17,13 @@ index 705797683bea7b29a873f01ddb99496f1a17eb40..dddbbdf2a5b3f7e28253c88b307ad42c
this.setPvpAllowed(dedicatedserverproperties.pvp);
this.setFlightAllowed(dedicatedserverproperties.allowFlight);
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index b932ea565a8381817dc159b938757666d8e167c7..e1b15532a60152d058ed0e1c68c0cff5ef481895 100644
index a3adc71d859fd34f57af9cae970356e1af268c69..cfd7df713a6767e5b4d2582c29ecaad3bfaaa5ef 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -989,6 +989,7 @@ public final class CraftServer implements Server {
@@ -982,6 +982,7 @@ public final class CraftServer implements Server {
this.reloadData();
org.spigotmc.SpigotConfig.registerCommands(); // Spigot
com.destroystokyo.paper.PaperConfig.registerCommands(); // Paper
io.papermc.paper.command.PaperCommands.registerCommands(this.console); // Paper
+ top.leavesmc.leaves.LeavesConfig.registerCommands(); // Leaves - Server Command
this.overrideAllCommandBlockCommands = this.commandsConfiguration.getStringList("command-block-overrides").contains("*");
this.ignoreVanillaPermissions = this.commandsConfiguration.getBoolean("ignore-vanilla-permissions");

59
patches/server/0009-Allow-vanilla-properties-def.patch
View File

@@ -4,46 +4,23 @@ Date: Wed, 2 Feb 2022 00:43:25 +0800
Subject: [PATCH] Allow vanilla properties def
diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java
index 88a4dda44e59fbe6215d7ac2e5af0c54527a2fc7..0a65617d5804636ee8c7a739d21b886ec635e075 100644
--- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
+++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
@@ -472,10 +472,10 @@ public class PaperConfig {
useRgbForNamedTextColors = getBoolean("settings.loggers.use-rgb-for-named-text-colors", useRgbForNamedTextColors);
diff --git a/src/main/java/io/papermc/paper/configuration/GlobalConfiguration.java b/src/main/java/io/papermc/paper/configuration/GlobalConfiguration.java
index 3e7086d31b2f101b2d6e982f3935922886cadc77..f16fa127406b6f48af21913e0b76d8dde6ed2a4b 100644
--- a/src/main/java/io/papermc/paper/configuration/GlobalConfiguration.java
+++ b/src/main/java/io/papermc/paper/configuration/GlobalConfiguration.java
@@ -136,12 +136,12 @@ public class GlobalConfiguration extends ConfigurationPart {
public class UnsupportedSettings extends ConfigurationPart {
@Comment("This setting controls if players should be able to break bedrock, end portals and other intended to be permanent blocks.")
- public boolean allowPermanentBlockBreakExploits = false;
+ public boolean allowPermanentBlockBreakExploits = true;
@Comment("This setting controls if player should be able to use TNT duplication, but this also allows duplicating carpet, rails and potentially other items")
- public boolean allowPistonDuplication = false;
+ public boolean allowPistonDuplication = true;
public boolean performUsernameValidation = true;
@Comment("This setting controls if players should be able to create headless pistons.")
- public boolean allowHeadlessPistons = false;
+ public boolean allowHeadlessPistons = true;
}
- public static boolean allowBlockPermanentBreakingExploits = false;
+ public static boolean allowBlockPermanentBreakingExploits = true;
private static void allowBlockPermanentBreakingExploits() {
if (config.contains("allow-perm-block-break-exploits")) {
- allowBlockPermanentBreakingExploits = config.getBoolean("allow-perm-block-break-exploits", false);
+ allowBlockPermanentBreakingExploits = config.getBoolean("allow-perm-block-break-exploits", true);
config.set("allow-perm-block-break-exploits", null);
}
@@ -488,10 +488,10 @@ public class PaperConfig {
consoleHasAllPermissions = getBoolean("settings.console-has-all-permissions", consoleHasAllPermissions);
}
- public static boolean allowPistonDuplication;
+ public static boolean allowPistonDuplication = true;
private static void allowPistonDuplication() {
config.set("settings.unsupported-settings.allow-piston-duplication-readme", "This setting controls if player should be able to use TNT duplication, but this also allows duplicating carpet, rails and potentially other items");
- allowPistonDuplication = getBoolean("settings.unsupported-settings.allow-piston-duplication", config.getBoolean("settings.unsupported-settings.allow-tnt-duplication", false));
+ allowPistonDuplication = getBoolean("settings.unsupported-settings.allow-piston-duplication", config.getBoolean("settings.unsupported-settings.allow-tnt-duplication", true));
set("settings.unsupported-settings.allow-tnt-duplication", null);
}
@@ -512,10 +512,10 @@ public class PaperConfig {
}
}
- public static boolean allowHeadlessPistons;
+ public static boolean allowHeadlessPistons = true;
private static void allowHeadlessPistons() {
config.set("settings.unsupported-settings.allow-headless-pistons-readme", "This setting controls if players should be able to create headless pistons.");
- allowHeadlessPistons = getBoolean("settings.unsupported-settings.allow-headless-pistons", false);
+ allowHeadlessPistons = getBoolean("settings.unsupported-settings.allow-headless-pistons", true);
}
public static int itemValidationDisplayNameLength = 8192;
public Commands commands;

16
patches/server/0010-Add-fakeplayer-support.patch
View File

@@ -5,10 +5,10 @@ Subject: [PATCH] Add fakeplayer support
diff --git a/src/main/java/net/minecraft/server/PlayerAdvancements.java b/src/main/java/net/minecraft/server/PlayerAdvancements.java
index b16287a47870978706734b928b87f2357e91e3a1..407c71621769f91955f0b3d2d87b4014f816737e 100644
index de0513b38e5fa0138f1cee6bb633561be12449fc..6de539d8819b9c25fbf96cd2ac8ef4a87c0fb231 100644
--- a/src/main/java/net/minecraft/server/PlayerAdvancements.java
+++ b/src/main/java/net/minecraft/server/PlayerAdvancements.java
@@ -51,6 +51,7 @@ import net.minecraft.server.players.PlayerList;
@@ -50,6 +50,7 @@ import net.minecraft.server.players.PlayerList;
import net.minecraft.util.datafix.DataFixTypes;
import net.minecraft.world.level.GameRules;
import org.slf4j.Logger;
@@ -16,7 +16,7 @@ index b16287a47870978706734b928b87f2357e91e3a1..407c71621769f91955f0b3d2d87b4014
public class PlayerAdvancements {
@@ -275,6 +276,11 @@ public class PlayerAdvancements {
@@ -274,6 +275,11 @@ public class PlayerAdvancements {
}
public boolean award(Advancement advancement, String criterionName) {
@@ -29,10 +29,10 @@ index b16287a47870978706734b928b87f2357e91e3a1..407c71621769f91955f0b3d2d87b4014
AdvancementProgress advancementprogress = this.getOrStartProgress(advancement);
boolean flag1 = advancementprogress.isDone();
diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
index 624946f48f0811c94d05174f28d0b1fc6d5e6a00..894aa46c7ee6b249107291d5042bae4bf908c9ab 100644
index 20cdfdb3b9351f74e89bc45b3ab972384165659a..e7fc2bd7241430354509158e1dceafb723d6f692 100644
--- a/src/main/java/net/minecraft/server/players/PlayerList.java
+++ b/src/main/java/net/minecraft/server/players/PlayerList.java
@@ -92,6 +92,7 @@ import net.minecraft.world.scores.Objective;
@@ -100,6 +100,7 @@ import net.minecraft.world.scores.Objective;
import net.minecraft.world.scores.PlayerTeam;
import net.minecraft.world.scores.Scoreboard; // Paper
import net.minecraft.world.scores.Team;
@@ -40,7 +40,7 @@ index 624946f48f0811c94d05174f28d0b1fc6d5e6a00..894aa46c7ee6b249107291d5042bae4b
import org.slf4j.Logger;
// CraftBukkit start
@@ -366,6 +367,17 @@ public abstract class PlayerList {
@@ -368,6 +369,17 @@ public abstract class PlayerList {
return;
}
@@ -123,7 +123,7 @@ index a85a5de7d85cf6c5e19c0245c40e6106e6623007..898c61c25675232e203ee2c872ca2580
public final String worldName;
diff --git a/src/main/java/top/leavesmc/leaves/bot/Bot.java b/src/main/java/top/leavesmc/leaves/bot/Bot.java
new file mode 100644
index 0000000000000000000000000000000000000000..48b10adcb7f86aed364c9286e37af260829e9308
index 0000000000000000000000000000000000000000..40ee486cdd3939b4d42e6dac042cd252dc07a001
--- /dev/null
+++ b/src/main/java/top/leavesmc/leaves/bot/Bot.java
@@ -0,0 +1,483 @@
@@ -198,7 +198,7 @@ index 0000000000000000000000000000000000000000..48b10adcb7f86aed364c9286e37af260
+ private static final Plugin MINECRAFT_PLUGIN = new MinecraftInternalPlugin();
+
+ public Bot(MinecraftServer server, ServerLevel world, GameProfile profile) {
+ super(server, world, profile);
+ super(server, world, profile, null);
+ this.entityData.set(new EntityDataAccessor<>(16, EntityDataSerializers.INT), 0xFF);
+
+ this.velocity = new Vector(0, 0, 0);

6
patches/server/0011-Add-fakeplayer-action-support.patch
View File

@@ -5,10 +5,10 @@ Subject: [PATCH] Add fakeplayer action support
diff --git a/src/main/java/net/minecraft/world/entity/player/Player.java b/src/main/java/net/minecraft/world/entity/player/Player.java
index 2483d7df7f1bf94344afd38b37602c645a4a2dff..4ef275139b0f1340238fbc48e9f522dd87067435 100644
index cd9cbfa5ef94994b3f7f2ecdde843620e7e6c071..7bd5a106028958c829ef9e161d5c287ff36c3f6c 100644
--- a/src/main/java/net/minecraft/world/entity/player/Player.java
+++ b/src/main/java/net/minecraft/world/entity/player/Player.java
@@ -1247,7 +1247,7 @@ public abstract class Player extends LivingEntity {
@@ -1290,7 +1290,7 @@ public abstract class Player extends LivingEntity {
boolean flag3 = false;
double d0 = (double) (this.walkDist - this.walkDistO);
@@ -30,7 +30,7 @@ index 898c61c25675232e203ee2c872ca25804c41358c..4d6d025c78086f186da710ae46f65eda
}
diff --git a/src/main/java/top/leavesmc/leaves/bot/Bot.java b/src/main/java/top/leavesmc/leaves/bot/Bot.java
index 48b10adcb7f86aed364c9286e37af260829e9308..5cf6e0b679222afe6b22b0096dbcc1d047ad6ae0 100644
index 40ee486cdd3939b4d42e6dac042cd252dc07a001..fd7b88845fb2a03fe94dfbb3bad0c6705ba56b31 100644
--- a/src/main/java/top/leavesmc/leaves/bot/Bot.java
+++ b/src/main/java/top/leavesmc/leaves/bot/Bot.java
@@ -1,9 +1,12 @@

13
patches/server/0013-Redstone-Shears-Wrench.patch
View File

@@ -5,10 +5,10 @@ Subject: [PATCH] Redstone Shears Wrench
diff --git a/src/main/java/net/minecraft/world/item/ShearsItem.java b/src/main/java/net/minecraft/world/item/ShearsItem.java
index e77af779c77de6d5580c13699df3e7d890fe7aba..8dee591de6358e577d4c78063cd86191c4f71cd1 100644
index e77af779c77de6d5580c13699df3e7d890fe7aba..8d2467e5faf74c83462ca6e1f8cd6b507a0ddb06 100644
--- a/src/main/java/net/minecraft/world/item/ShearsItem.java
+++ b/src/main/java/net/minecraft/world/item/ShearsItem.java
@@ -1,7 +1,11 @@
@@ -1,7 +1,10 @@
package net.minecraft.world.item;
+import net.minecraft.Util;
@@ -16,11 +16,10 @@ index e77af779c77de6d5580c13699df3e7d890fe7aba..8dee591de6358e577d4c78063cd86191
import net.minecraft.core.BlockPos;
+import net.minecraft.network.chat.ChatType;
+import net.minecraft.network.chat.Component;
+import net.minecraft.network.chat.TranslatableComponent;
import net.minecraft.server.level.ServerPlayer;
import net.minecraft.sounds.SoundEvents;
import net.minecraft.sounds.SoundSource;
@@ -14,8 +18,18 @@ import net.minecraft.world.item.context.UseOnContext;
@@ -14,8 +17,18 @@ import net.minecraft.world.item.context.UseOnContext;
import net.minecraft.world.level.Level;
import net.minecraft.world.level.block.Block;
import net.minecraft.world.level.block.Blocks;
@@ -39,7 +38,7 @@ index e77af779c77de6d5580c13699df3e7d890fe7aba..8dee591de6358e577d4c78063cd86191
public class ShearsItem extends Item {
public ShearsItem(Item.Properties settings) {
@@ -77,6 +91,59 @@ public class ShearsItem extends Item {
@@ -77,6 +90,59 @@ public class ShearsItem extends Item {
}
}
@@ -73,7 +72,7 @@ index e77af779c77de6d5580c13699df3e7d890fe7aba..8dee591de6358e577d4c78063cd86191
+
+ BlockState iblockdata1 = ShearsItem.cycleState(blockState, iblockstate, player.isSecondaryUseActive());
+ level.setBlock(blockPos, iblockdata1, 18);
+ ShearsItem.message(player, new TranslatableComponent("item.minecraft.debug_stick.update", iblockstate.getName(), ShearsItem.getNameHelper(iblockdata1, iblockstate)));
+ ShearsItem.message(player, Component.translatable("item.minecraft.debug_stick.update", iblockstate.getName(), ShearsItem.getNameHelper(iblockdata1, iblockstate)));
+ return InteractionResult.CONSUME_PARTIAL;
+ }
+ // Leaves end - shears wrench
@@ -91,7 +90,7 @@ index e77af779c77de6d5580c13699df3e7d890fe7aba..8dee591de6358e577d4c78063cd86191
+ }
+
+ private static void message(Player player, Component message) {
+ ((ServerPlayer) player).sendMessage(message, ChatType.GAME_INFO, Util.NIL_UUID);
+ ((ServerPlayer) player).sendSystemMessage(message, ChatType.GAME_INFO);
+ }
+
+ private static <T extends Comparable<T>> String getNameHelper(BlockState state, Property<T> property) {

8
patches/server/0014-Add-isShrink-to-EntityResurrectEvent.patch
View File

@@ -5,10 +5,10 @@ Subject: [PATCH] Add isShrink to EntityResurrectEvent
diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
index bd5825c5b5c81e0694a3635b981588f0d2ba83cb..3357ae0a3907f41dfd9a7f373e1c0b9643de498d 100644
index e8dc99752d06ca40f17f3ad2c829b2447b703d7c..43d15afe4c121c3c808639b6737e157d8cd08f91 100644
--- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
+++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
@@ -1507,12 +1507,12 @@ public abstract class LivingEntity extends Entity {
@@ -1530,12 +1530,12 @@ public abstract class LivingEntity extends Entity {
}
}
@@ -23,8 +23,8 @@ index bd5825c5b5c81e0694a3635b981588f0d2ba83cb..3357ae0a3907f41dfd9a7f373e1c0b96
itemstack1.shrink(1);
}
if (itemstack != null && this instanceof ServerPlayer) {
@@ -4343,3 +4343,4 @@ public abstract class LivingEntity extends Entity {
// CraftBukkit end
@@ -4371,3 +4371,4 @@ public abstract class LivingEntity extends Entity {
}
}
+