mirror of
https://github.com/LeavesMC/Leaves.git
synced 2026-01-06 15:51:33 +00:00
Update Paper
This commit is contained in:
@@ -4,6 +4,6 @@ version=1.20.4-R0.1-SNAPSHOT
|
||||
mcVersion=1.20.4
|
||||
packageVersion=1_20_R3
|
||||
org.gradle.jvmargs=-Xmx2G
|
||||
paperRef=1ed50dade82437bf45fe74833d7e6ac2961842a2
|
||||
paperRef=b3c81089ae26cc3ad2e7388c7b64457f3f83c98a
|
||||
preVersion=false
|
||||
updatingMinecraft=false
|
||||
@@ -31,7 +31,7 @@ index b0708f5d72a31720e3696ee707ec21229672bcf0..129c2e6f0cc9d752e7ca5934e13e8935
|
||||
|
||||
this.setPvpAllowed(dedicatedserverproperties.pvp);
|
||||
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
|
||||
index b0b66b9bf0a66c69967b792d0136c39d4036c191..f9a32d3aa3a1bf6fbdfaa78781afe058af921267 100644
|
||||
index 857004a702cbc94f53ca17cd19c7affa8d9a83d1..9603dc46d18f2b8eb79e64ecfa09f14a6cd0e275 100644
|
||||
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
|
||||
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
|
||||
@@ -1064,6 +1064,7 @@ public final class CraftServer implements Server {
|
||||
@@ -42,7 +42,7 @@ index b0b66b9bf0a66c69967b792d0136c39d4036c191..f9a32d3aa3a1bf6fbdfaa78781afe058
|
||||
this.reloadData();
|
||||
org.spigotmc.SpigotConfig.registerCommands(); // Spigot
|
||||
io.papermc.paper.command.PaperCommands.registerCommands(this.console); // Paper
|
||||
@@ -2997,6 +2998,14 @@ public final class CraftServer implements Server {
|
||||
@@ -2995,6 +2996,14 @@ public final class CraftServer implements Server {
|
||||
{
|
||||
return CraftServer.this.console.paperConfigurations.createLegacyObject(CraftServer.this.console);
|
||||
}
|
||||
|
||||
@@ -347,7 +347,7 @@ index ed80960777b18faca2d6a99783e53daf5fa19e09..9d492a2a45a2088f4bf28c85f04c22fa
|
||||
if (randomsource.nextInt(j) >= world.paperConfig().entities.behavior.playerInsomniaStartTicks) { // Paper - Ability to control player's insomnia and phantoms
|
||||
BlockPos blockposition1 = blockposition.above(20 + randomsource.nextInt(15)).east(-10 + randomsource.nextInt(21)).south(-10 + randomsource.nextInt(21));
|
||||
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
|
||||
index b1c8806e65c97bbeb96ea03aae0ffba9f5d7ae5b..cb54b576d71f4b9c0a64199e03e99b1a8f2a1832 100644
|
||||
index 08368c1cddaf96a329e8034ee9ab52ac03b1dd88..52ab6030ebbffbe42979bee57cc6e26d30067e09 100644
|
||||
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
|
||||
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
|
||||
@@ -259,6 +259,7 @@ import org.yaml.snakeyaml.constructor.SafeConstructor;
|
||||
@@ -366,7 +366,7 @@ index b1c8806e65c97bbeb96ea03aae0ffba9f5d7ae5b..cb54b576d71f4b9c0a64199e03e99b1a
|
||||
|
||||
// Paper start - Folia region threading API
|
||||
private final io.papermc.paper.threadedregions.scheduler.FallbackRegionScheduler regionizedScheduler = new io.papermc.paper.threadedregions.scheduler.FallbackRegionScheduler();
|
||||
@@ -3240,4 +3242,11 @@ public final class CraftServer implements Server {
|
||||
@@ -3238,4 +3240,11 @@ public final class CraftServer implements Server {
|
||||
}
|
||||
|
||||
// Paper end
|
||||
|
||||
@@ -369,7 +369,7 @@ index d9848bbe9c1874f85c4d774e24fea60261251ccb..f5e64399b9be6e7db3a9dd11d47ed918
|
||||
}
|
||||
}
|
||||
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
|
||||
index cb54b576d71f4b9c0a64199e03e99b1a8f2a1832..324429bc3ab08a62f720a4f7d5e31ea68b30668b 100644
|
||||
index 52ab6030ebbffbe42979bee57cc6e26d30067e09..54610e61b83e43d35ad9f0b496a730ce261466c0 100644
|
||||
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
|
||||
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
|
||||
@@ -260,6 +260,7 @@ import org.yaml.snakeyaml.error.MarkedYAMLException;
|
||||
@@ -397,7 +397,7 @@ index cb54b576d71f4b9c0a64199e03e99b1a8f2a1832..324429bc3ab08a62f720a4f7d5e31ea6
|
||||
@Override
|
||||
public CraftPlayer apply(ServerPlayer player) {
|
||||
return player.getBukkitEntity();
|
||||
@@ -3249,4 +3251,11 @@ public final class CraftServer implements Server {
|
||||
@@ -3247,4 +3249,11 @@ public final class CraftServer implements Server {
|
||||
return botManager;
|
||||
}
|
||||
// Leaves end - Bot API
|
||||
|
||||
Reference in New Issue
Block a user