Mirrors/Purpur
1
0
Fork 1
mirror of https://github.com/PurpurMC/Purpur.git synced 2026-02-17 16:37:43 +01:00
Code Issues Packages Projects Releases Wiki Activity

update paper

Browse Source
This commit is contained in:
BillyGalbreath
2021-06-19 12:48:05 -05:00
parent e843dbbbd0
commit 666c7eac20
3 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
gradle.properties
View File

@@ -1,7 +1,7 @@
group=net.pl3x.purpur group=net.pl3x.purpur
version=1.17-R0.1-SNAPSHOT version=1.17-R0.1-SNAPSHOT
packageVersion=1_17_R1 packageVersion=1_17_R1
paperCommit=7f82b50636a94e9daed26436acafa8e33f37b1f2 paperCommit=ac95f25f3534d0c5e65ea7d106973639a58670a1
org.gradle.parallel=true org.gradle.parallel=true
org.gradle.jvmargs=-Xmx3G org.gradle.jvmargs=-Xmx3G

10
patches/server/0001-Rebrand.patch
View File

@@ -5,7 +5,7 @@ Subject: [PATCH] Rebrand
diff --git a/build.gradle.kts b/build.gradle.kts diff --git a/build.gradle.kts b/build.gradle.kts
index 03521590dfcbb09416097e793fae5951c1ae3cc0..ab116b119193143757ab3f27f96e9f9ce4ba8165 100644 index 04938bb10c35d2e424043adb7ed8fec2e42bb816..4bcd8f006c94a82970be91cc58583b2261270567 100644
--- a/build.gradle.kts --- a/build.gradle.kts
+++ b/build.gradle.kts +++ b/build.gradle.kts
@@ -18,8 +18,8 @@ repositories { @@ -18,8 +18,8 @@ repositories {
@@ -25,9 +25,9 @@ index 03521590dfcbb09416097e793fae5951c1ae3cc0..ab116b119193143757ab3f27f96e9f9c
implementation("io.netty:netty-all:4.1.65.Final") // Paper implementation("io.netty:netty-all:4.1.65.Final") // Paper
+ implementation("cat.inspiracio:rhino-js-engine:1.7.7.1") // Purpur + implementation("cat.inspiracio:rhino-js-engine:1.7.7.1") // Purpur
testImplementation("io.github.classgraph:classgraph:4.8.47") // Paper - mob goal test implementation("com.github.oshi:oshi-core:5.7.5") // Paper - fix startup delay and warning
testImplementation("junit:junit:4.13.1")
@@ -64,7 +65,7 @@ tasks.jar { @@ -66,7 +67,7 @@ tasks.jar {
attributes( attributes(
"Main-Class" to "org.bukkit.craftbukkit.Main", "Main-Class" to "org.bukkit.craftbukkit.Main",
"Implementation-Title" to "CraftBukkit", "Implementation-Title" to "CraftBukkit",
@@ -36,7 +36,7 @@ index 03521590dfcbb09416097e793fae5951c1ae3cc0..ab116b119193143757ab3f27f96e9f9c
"Implementation-Vendor" to SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss'Z'").format(Date()), // Paper "Implementation-Vendor" to SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss'Z'").format(Date()), // Paper
"Specification-Title" to "Bukkit", "Specification-Title" to "Bukkit",
"Specification-Version" to project.version, "Specification-Version" to project.version,
@@ -120,7 +121,7 @@ tasks.test { @@ -122,7 +123,7 @@ tasks.test {
fun TaskContainer.registerRunTask( fun TaskContainer.registerRunTask(
name: String, block: JavaExec.() -> Unit name: String, block: JavaExec.() -> Unit
): TaskProvider<JavaExec> = register<JavaExec>(name) { ): TaskProvider<JavaExec> = register<JavaExec>(name) {

6
patches/server/0115-Infinite-fuel-furnace.patch
View File

@@ -5,7 +5,7 @@ Subject: [PATCH] Infinite fuel furnace
diff --git a/src/main/java/net/minecraft/world/level/block/entity/AbstractFurnaceBlockEntity.java b/src/main/java/net/minecraft/world/level/block/entity/AbstractFurnaceBlockEntity.java diff --git a/src/main/java/net/minecraft/world/level/block/entity/AbstractFurnaceBlockEntity.java b/src/main/java/net/minecraft/world/level/block/entity/AbstractFurnaceBlockEntity.java
index de53c9652fd6103c4ee5bdb9304979b675cb2bd7..ad281f15ff8fca4770b6a8c3bb81964a835f7f4f 100644 index c559ec5041474e585e4d95a664c84e1fa895cf16..806277d029a1c1a2d334a05d94163415c2619b8d 100644
--- a/src/main/java/net/minecraft/world/level/block/entity/AbstractFurnaceBlockEntity.java --- a/src/main/java/net/minecraft/world/level/block/entity/AbstractFurnaceBlockEntity.java
+++ b/src/main/java/net/minecraft/world/level/block/entity/AbstractFurnaceBlockEntity.java +++ b/src/main/java/net/minecraft/world/level/block/entity/AbstractFurnaceBlockEntity.java
@@ -40,6 +40,7 @@ import net.minecraft.world.level.Level; @@ -40,6 +40,7 @@ import net.minecraft.world.level.Level;
@@ -16,7 +16,7 @@ index de53c9652fd6103c4ee5bdb9304979b675cb2bd7..ad281f15ff8fca4770b6a8c3bb81964a
import net.minecraft.world.phys.Vec3; import net.minecraft.world.phys.Vec3;
// CraftBukkit start // CraftBukkit start
import org.bukkit.craftbukkit.block.CraftBlock; import org.bukkit.craftbukkit.block.CraftBlock;
@@ -316,6 +317,22 @@ public abstract class AbstractFurnaceBlockEntity extends BaseContainerBlockEntit @@ -317,6 +318,22 @@ public abstract class AbstractFurnaceBlockEntity extends BaseContainerBlockEntit
ItemStack itemstack = (ItemStack) blockEntity.items.get(1); ItemStack itemstack = (ItemStack) blockEntity.items.get(1);
@@ -39,7 +39,7 @@ index de53c9652fd6103c4ee5bdb9304979b675cb2bd7..ad281f15ff8fca4770b6a8c3bb81964a
if (!blockEntity.isLit() && (itemstack.isEmpty() || ((ItemStack) blockEntity.items.get(0)).isEmpty())) { if (!blockEntity.isLit() && (itemstack.isEmpty() || ((ItemStack) blockEntity.items.get(0)).isEmpty())) {
if (!blockEntity.isLit() && blockEntity.cookingProgress > 0) { if (!blockEntity.isLit() && blockEntity.cookingProgress > 0) {
blockEntity.cookingProgress = Mth.clamp(blockEntity.cookingProgress - 2, 0, blockEntity.cookingTotalTime); blockEntity.cookingProgress = Mth.clamp(blockEntity.cookingProgress - 2, 0, blockEntity.cookingTotalTime);
@@ -379,6 +396,7 @@ public abstract class AbstractFurnaceBlockEntity extends BaseContainerBlockEntit @@ -380,6 +397,7 @@ public abstract class AbstractFurnaceBlockEntity extends BaseContainerBlockEntit
setChanged(world, pos, state); setChanged(world, pos, state);
} }