Skip to content
This repository has been archived by the owner on Feb 15, 2024. It is now read-only.

Commit

Permalink
Update paperweight to 1.5.9
Browse files Browse the repository at this point in the history
  • Loading branch information
Euphillya committed Oct 31, 2023
1 parent e2f2e6d commit 2263ab4
Show file tree
Hide file tree
Showing 32 changed files with 24 additions and 25 deletions.
2 changes: 1 addition & 1 deletion build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import io.papermc.paperweight.util.constants.*
plugins {
java
id("com.github.johnrengelman.shadow") version "8.1.1"
id("io.papermc.paperweight.patcher") version "1.5.7"
id("io.papermc.paperweight.patcher") version "1.5.9"
}

allprojects {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,16 +1,15 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Bierque Jason <bierquejason@gmail.com>
Date: Sat, 21 Oct 2023 19:50:16 +0200
Subject: [PATCH] Fix Folia PR :
https://github.com/PaperMC/Folia/pull/164/commits/480ce47ff596e6d95889ee45f8ff5ab27e2ef3b1
Fix command sender check
Subject: [PATCH] Folia Pull Request Pending validation

https://github.com/PaperMC/Folia/pull/164/commits/480ce47ff596e6d95889ee45f8ff5ab27e2ef3b1 Fix command sender check

diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index cf922f625f92839480ef842722dc9024ce8d21de..73c015acc0c1801316192f1186375b9f90a506c8 100644
index a50a9ffda4875061fb8840873115119f334f0519..68fa7b36250aa7656f4f553e20e61fbec22097d0 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -1024,7 +1024,7 @@ public final class CraftServer implements Server {
@@ -999,7 +999,7 @@ public final class CraftServer implements Server {
null,
1L
);
Expand All @@ -19,7 +18,7 @@ index cf922f625f92839480ef842722dc9024ce8d21de..73c015acc0c1801316192f1186375b9f
io.papermc.paper.threadedregions.RegionizedServer.getInstance().addTask(() -> {
CraftServer.this.dispatchCommand(sender, commandLine);
});
@@ -1044,7 +1044,7 @@ public final class CraftServer implements Server {
@@ -1019,7 +1019,7 @@ public final class CraftServer implements Server {
// Folia start - region threading
if ((sender instanceof Entity entity)) {
io.papermc.paper.util.TickThread.ensureTickThread(((org.bukkit.craftbukkit.entity.CraftEntity)entity).getHandle(), "Dispatching command async");
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -134,7 +134,7 @@ index 2f2a8a0c05024115f3b7bd69ae400fadff2f36c5..b62137def6ac3826eb5d9e367d97579b

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 a50a9ffda4875061fb8840873115119f334f0519..eb302567a5e6e83ad64547445e0d9e058aacccdc 100644
index 68fa7b36250aa7656f4f553e20e61fbec22097d0..5ff32e5500fecd4c87ef34a2afb2ab11891cb3f3 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -267,7 +267,7 @@ import javax.annotation.Nullable; // Paper
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -247,7 +247,7 @@ index 0ff6764c747ee6258ab9d722b48c24f0ddb2afdf..676293d6977d2403df70a4d26a1a34bb
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 cba140514d91a6d9713a2bd38a112f565e3c6bb0..312ade879d178a385c4cdf8d330598fa7f7d65b8 100644
index 5ff32e5500fecd4c87ef34a2afb2ab11891cb3f3..e54716eb3d916c1db04f76613ac81c5516145d4c 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -1080,6 +1080,7 @@ public final class CraftServer implements Server {
Expand Down Expand Up @@ -282,7 +282,7 @@ index cba140514d91a6d9713a2bd38a112f565e3c6bb0..312ade879d178a385c4cdf8d330598fa
public void restart() {
org.spigotmc.RestartCommand.restart();
diff --git a/src/main/java/org/bukkit/craftbukkit/Main.java b/src/main/java/org/bukkit/craftbukkit/Main.java
index e7746952417a3ca4ea97103e38568db42039f717..8574ae30cb88c17e8c2a2b819c2acc8c52aaa557 100644
index e4cacb17f56c618bef19e1165c07aac86af61150..266122ad86855de1b9e7c50b528637831376ac7e 100644
--- a/src/main/java/org/bukkit/craftbukkit/Main.java
+++ b/src/main/java/org/bukkit/craftbukkit/Main.java
@@ -173,6 +173,14 @@ public class Main {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ index 4bc8c7f69c94be174c5385c3b8ed64670b7e673d..80e76f54978047b48990a6c928c972a7
+ }
}
diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
index 7bfbcda5cf086c3c50f8cb202ceaf685a899141c..07a1f27050df27d6a8a277d61bc7136cc4f3a7a1 100644
index 9da89e8e9569666227081ebc6cb1f0348e1a183d..ac9e0f7abe9a41fb3209ef6f8044a03f359d8e07 100644
--- a/src/main/java/net/minecraft/server/players/PlayerList.java
+++ b/src/main/java/net/minecraft/server/players/PlayerList.java
@@ -1241,6 +1241,27 @@ public abstract class PlayerList {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ index a18aadbf7ae83713e1f2b21553185d8000bc7699..aac9515a73e2e9d449ca4e2c99874963
private int maxStack = MAX_STACK;
public List<HumanEntity> transaction = new java.util.ArrayList<HumanEntity>();
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index 312ade879d178a385c4cdf8d330598fa7f7d65b8..3967cbb51ed68f92bbe711f95b080617893e1df0 100644
index e54716eb3d916c1db04f76613ac81c5516145d4c..1a7f17e7d85dd42c7331d79712e698c956e20f49 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -265,6 +265,7 @@ import net.md_5.bungee.api.chat.BaseComponent; // Spigot
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ Subject: [PATCH] Add Option for disable observer clocks


diff --git a/src/main/java/fr/euphilia/tenseimc/TenseiWorldConfig.java b/src/main/java/fr/euphilia/tenseimc/TenseiWorldConfig.java
index 88392a19ff87af5966adc2cd54b10ac61b8dde03..e719d5a3a5acfd971010eb3469de7d059eae7a08 100644
index f15cffe87dd294d25b40dae056eb6964c3610d0d..6a0cf3bc937425fe5df6cb010e8be89025abb5c6 100644
--- a/src/main/java/fr/euphilia/tenseimc/TenseiWorldConfig.java
+++ b/src/main/java/fr/euphilia/tenseimc/TenseiWorldConfig.java
@@ -64,4 +64,8 @@ public class TenseiWorldConfig {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ Subject: [PATCH] Configurable piston push limit


diff --git a/src/main/java/fr/euphilia/tenseimc/TenseiWorldConfig.java b/src/main/java/fr/euphilia/tenseimc/TenseiWorldConfig.java
index e719d5a3a5acfd971010eb3469de7d059eae7a08..93f59b4363277a665b2462396cd910d00f43062d 100644
index 6a0cf3bc937425fe5df6cb010e8be89025abb5c6..88a753fcf568e4628ac5470782f35504e2e1b6e0 100644
--- a/src/main/java/fr/euphilia/tenseimc/TenseiWorldConfig.java
+++ b/src/main/java/fr/euphilia/tenseimc/TenseiWorldConfig.java
@@ -65,7 +65,9 @@ public class TenseiWorldConfig {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ Subject: [PATCH] Disable outdated build check


diff --git a/src/main/java/org/bukkit/craftbukkit/Main.java b/src/main/java/org/bukkit/craftbukkit/Main.java
index 8574ae30cb88c17e8c2a2b819c2acc8c52aaa557..58bd5fc9a7b10c8001a1baf6597d36c999b6b75e 100644
index 266122ad86855de1b9e7c50b528637831376ac7e..3ffc77446cea2c8c295ddcf11e2dfe4b9a0aeda9 100644
--- a/src/main/java/org/bukkit/craftbukkit/Main.java
+++ b/src/main/java/org/bukkit/craftbukkit/Main.java
@@ -300,7 +300,7 @@ public class Main {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ Subject: [PATCH] Method Custom WorldBorder Player


diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
index 27ace1119456c92b456d08a464c58d4231685f9c..97a7cacb036047ed628c8c0ff48d16f3f0ce2074 100644
index 44c09217241fae975fa4f734dfc5be4b03094e73..26f98f72c4a34af71f0901578fbe3a4ce436b69b 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -1132,6 +1132,26 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ Subject: [PATCH] Method Update Chunk Client


diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
index 97a7cacb036047ed628c8c0ff48d16f3f0ce2074..640a6a8ff5418b434801edff2ad65f21f12cfc58 100644
index 26f98f72c4a34af71f0901578fbe3a4ce436b69b..e27b03eb381050b1c11a238b26b2d650dc1f4c05 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -1150,6 +1150,14 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ Subject: [PATCH] Allow player join full server by permission


diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
index 07a1f27050df27d6a8a277d61bc7136cc4f3a7a1..c847cdbde46078e662777925be87fddc16c7e39b 100644
index ac9e0f7abe9a41fb3209ef6f8044a03f359d8e07..c6971f42e1a545ea92a94ddaa0a333e062a3e7cf 100644
--- a/src/main/java/net/minecraft/server/players/PlayerList.java
+++ b/src/main/java/net/minecraft/server/players/PlayerList.java
@@ -815,7 +815,7 @@ public abstract class PlayerList {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ index 96aeddaaabb6f1570f61738eb16125757f51968f..a63630f34706703cb34ce2a691b4afb2
+ }
}
diff --git a/src/main/java/net/minecraft/world/entity/animal/Bee.java b/src/main/java/net/minecraft/world/entity/animal/Bee.java
index 55026e1731e41b4e3e4c6a8fef5d96a32051a556..f147e9c4615ece32586e8e8fdb0481a53a20e395 100644
index 25fd3aea2d66503018637781ccb8b5690c02e57b..5c179c77984256bdf559758d8d48b045459f8784 100644
--- a/src/main/java/net/minecraft/world/entity/animal/Bee.java
+++ b/src/main/java/net/minecraft/world/entity/animal/Bee.java
@@ -348,7 +348,7 @@ public class Bee extends Animal implements NeutralMob, FlyingAnimal {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ index e38e2e5a7ddba9c140f362021b6be0b0974f7cd1..c1149705fa8de5397ec6455975b5005c
}

diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
index 42ff3d94ee451ced69c1059f0dbd45085489a60d..c282e7ca254f148c988c37889ed5efc0803f94c6 100644
index 62a98ba81cbe89622dd6a545146ff52aa57de880..4a0188469f8bd9d29059e300890691f443d086dc 100644
--- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
+++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
@@ -1093,7 +1093,7 @@ public class ServerPlayer extends Player {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ index 4ebf12ce135c9210fbd1bb48ba98e1c0a3f40e9a..525e94f0a2a01698718977c8104b4a96
}
}
diff --git a/src/main/java/net/minecraft/world/level/material/LavaFluid.java b/src/main/java/net/minecraft/world/level/material/LavaFluid.java
index 8a0d7a6cc72d49ee0f5e42b3b5fbf3f087f91fd8..9db273f43e2ef655c0a40bb45823e71be3062776 100644
index a9f407eeb2e2bcb26e53418d5d878944bce04780..369aa58ea09d1316545cf71e41a34762f5fbd9c6 100644
--- a/src/main/java/net/minecraft/world/level/material/LavaFluid.java
+++ b/src/main/java/net/minecraft/world/level/material/LavaFluid.java
@@ -180,7 +180,7 @@ public abstract class LavaFluid extends FlowingFluid {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ index 525e94f0a2a01698718977c8104b4a96b3eb22d4..48874bcbcd65418dec7013e3a1061153
}
}
diff --git a/src/main/java/net/minecraft/world/level/material/WaterFluid.java b/src/main/java/net/minecraft/world/level/material/WaterFluid.java
index 2e1a8dd2aa071a90df9989b5226a2b21b24c9253..97acf33c8c2e6c813fc479b73f72d77289190fce 100644
index 4cad1459f205d9e2cf7d56c6ae4ec0726890d5f0..6ffd3461a74f15318bde746fa4606879ba2ccf13 100644
--- a/src/main/java/net/minecraft/world/level/material/WaterFluid.java
+++ b/src/main/java/net/minecraft/world/level/material/WaterFluid.java
@@ -106,7 +106,7 @@ public abstract class WaterFluid extends FlowingFluid {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ index 8b5f44d8a9d6b4bc66ad2a6554ca48ad76d7ae41..fd2dbe80228d6a77785ff53728cff681
}
}
diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
index 758bcbf493bf7e3b65086f8b38750f28c83dadcb..79fcb7e1b5867339d5bad1f2ff8ac072eda43a3a 100644
index b62137def6ac3826eb5d9e367d97579b32fe01d2..93398f0e887c4c177ce6a4c0dd6b214854b65a4d 100644
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
@@ -744,6 +744,8 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
Expand All @@ -42,7 +42,7 @@ index 758bcbf493bf7e3b65086f8b38750f28c83dadcb..79fcb7e1b5867339d5bad1f2ff8ac072
world.registryAccess().registry(Registries.CONFIGURED_FEATURE).flatMap((iregistry) -> {
return iregistry.getHolder(MiscOverworldFeatures.BONUS_CHEST);
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index 3967cbb51ed68f92bbe711f95b080617893e1df0..b31aad316d16389ee39c08a74453aa713ed93886 100644
index 1a7f17e7d85dd42c7331d79712e698c956e20f49..73c015acc0c1801316192f1186375b9f90a506c8 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -1293,7 +1293,7 @@ public final class CraftServer implements Server {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ Subject: [PATCH] Reactivate command: /worldborder I haven't found any bugs


diff --git a/src/main/java/net/minecraft/commands/Commands.java b/src/main/java/net/minecraft/commands/Commands.java
index 4f6bd2d88219ac82c4d08c35231e5d3314f87110..798c58c74f755c1811d4d3347c9a76c3be86bb19 100644
index 3435bdeaf723c64103f7c924ea42a4ec78f2ba01..a55e078247701d252d649d6f70503b4ff43b40df 100644
--- a/src/main/java/net/minecraft/commands/Commands.java
+++ b/src/main/java/net/minecraft/commands/Commands.java
@@ -202,7 +202,7 @@ public class Commands {
Expand Down

0 comments on commit 2263ab4

Please sign in to comment.