mirror of
https://github.com/LeavesMC/Leaves.git
synced 2025-12-19 14:59:32 +00:00
Update Paper
This commit is contained in:
@@ -1,7 +1,7 @@
|
|||||||
plugins {
|
plugins {
|
||||||
java
|
java
|
||||||
id("com.github.johnrengelman.shadow") version "7.1.0" apply false
|
id("com.github.johnrengelman.shadow") version "7.1.2" apply false
|
||||||
id("io.papermc.paperweight.patcher") version "1.3.3"
|
id("io.papermc.paperweight.patcher") version "1.3.5"
|
||||||
}
|
}
|
||||||
|
|
||||||
repositories {
|
repositories {
|
||||||
@@ -12,7 +12,7 @@ repositories {
|
|||||||
}
|
}
|
||||||
|
|
||||||
dependencies {
|
dependencies {
|
||||||
remapper("net.fabricmc:tiny-remapper:0.7.0:fat")
|
remapper("net.fabricmc:tiny-remapper:0.8.1:fat")
|
||||||
decompiler("net.minecraftforge:forgeflower:1.5.498.22")
|
decompiler("net.minecraftforge:forgeflower:1.5.498.22")
|
||||||
paperclip("io.papermc:paperclip:3.0.2")
|
paperclip("io.papermc:paperclip:3.0.2")
|
||||||
}
|
}
|
||||||
@@ -65,4 +65,4 @@ paperweight {
|
|||||||
serverOutputDir.set(layout.projectDirectory.dir("leaves-server"))
|
serverOutputDir.set(layout.projectDirectory.dir("leaves-server"))
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -4,4 +4,4 @@ version = 1.18.2-R0.1-SNAPSHOT
|
|||||||
mcVersion = 1.18.2
|
mcVersion = 1.18.2
|
||||||
packageVersion = 1_18_R2
|
packageVersion = 1_18_R2
|
||||||
org.gradle.jvmargs=-Xmx2G
|
org.gradle.jvmargs=-Xmx2G
|
||||||
paperRef=1e12cf8db62dde92a4bc79300ef32e0fdc6e50a8
|
paperRef=c34fb0942a73b932dc182c063e398ed47182fa61
|
||||||
|
|||||||
2
gradle/wrapper/gradle-wrapper.properties
vendored
2
gradle/wrapper/gradle-wrapper.properties
vendored
@@ -1,5 +1,5 @@
|
|||||||
distributionBase=GRADLE_USER_HOME
|
distributionBase=GRADLE_USER_HOME
|
||||||
distributionPath=wrapper/dists
|
distributionPath=wrapper/dists
|
||||||
distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.3-bin.zip
|
distributionUrl=https\://services.gradle.org/distributions/gradle-7.4-bin.zip
|
||||||
zipStoreBase=GRADLE_USER_HOME
|
zipStoreBase=GRADLE_USER_HOME
|
||||||
zipStorePath=wrapper/dists
|
zipStorePath=wrapper/dists
|
||||||
|
|||||||
@@ -67,7 +67,7 @@ index 160c0f37aa3aaf7598f852acf9bd444f79444c97..53409a2c7cf2143e085c724a6e96e8ea
|
|||||||
this.world = new CraftWorld((ServerLevel) this, gen, biomeProvider, env);
|
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
|
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
|
||||||
index 25b9d4ccedb9df8b5134a15aa81ccf391db6b8da..85aec3b017e11ab94cc0846be019fb5d632127f9 100644
|
index a554fbe3db6030084029839fdfe9a3d955b10d26..3fb3fc5b30d3cb171047cfb9caebf064a83f02bc 100644
|
||||||
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
|
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
|
||||||
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
|
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
|
||||||
@@ -955,6 +955,7 @@ public final class CraftServer implements Server {
|
@@ -955,6 +955,7 @@ public final class CraftServer implements Server {
|
||||||
@@ -86,7 +86,7 @@ index 25b9d4ccedb9df8b5134a15aa81ccf391db6b8da..85aec3b017e11ab94cc0846be019fb5d
|
|||||||
}
|
}
|
||||||
|
|
||||||
Plugin[] pluginClone = pluginManager.getPlugins().clone(); // Paper
|
Plugin[] pluginClone = pluginManager.getPlugins().clone(); // Paper
|
||||||
@@ -2673,6 +2675,14 @@ public final class CraftServer implements Server {
|
@@ -2693,6 +2695,14 @@ public final class CraftServer implements Server {
|
||||||
{
|
{
|
||||||
return com.destroystokyo.paper.PaperConfig.config;
|
return com.destroystokyo.paper.PaperConfig.config;
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user