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

Updated Upstream (Paper)

Browse Source 
Upstream has released updates that appear to apply and compile correctly

Paper Changes:
PaperMC/Paper@ce7f068 Correct typo in javadoc (#9944)
PaperMC/Paper@0a8c873 Call LivingEntity#onItemPickup before mutation (#9948)
PaperMC/Paper@e5274ee Fix spawners checking max nearby entities with correct type (#8945)
PaperMC/Paper@39dee1a More paper config cleanup (#9938)
PaperMC/Paper@581c743 Add API to retrieve an attribute modifier from a UUID (#9924)
PaperMC/Paper@8611796 Fix missing event call for entity teleport API (#9937)
PaperMC/Paper@250388d add getAdvancementProgress() to PlayerAdvancementCriterionGrantEvent (#9865)
This commit is contained in:
granny
2023-11-18 23:40:16 -08:00
parent 2a38801aeb
commit 4b1a082c94
4 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
gradle.properties
View File

@@ -2,7 +2,7 @@ group = org.purpurmc.purpur
version = 1.20.2-R0.1-SNAPSHOT
mcVersion = 1.20.2
paperCommit = f186318a91cbd3b2a2259d39cb88576989a496b8
paperCommit = 250388defed6660c57f40733c318ac90b846c264
org.gradle.caching = true
org.gradle.parallel = true

6
patches/server/0008-Ridables.patch
View File

@@ -34,7 +34,7 @@ index ef14f47cec00ffaf1ac683964d3d1831dae9bcdb..be7508a527a55ada0f769588db024f99
this.profiler.push(() -> {
return worldserver + " " + worldserver.dimension().location();
diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
index ee0403e18b484b85c92aca76faf977c013bfdfe0..f7a19cdc38feb0dcee3e3cf42610a0604f9f4672 100644
index 8aab01170fb512d98103935a19e468a145a6bb16..5d20509fd92969ed05f1044290650880fd4a663e 100644
--- a/src/main/java/net/minecraft/server/level/ServerLevel.java
+++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
@@ -223,6 +223,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
@@ -5191,10 +5191,10 @@ index 06d1bdb9bd124b201c36d284c50d22bf50d3735a..937f57d8af629c4e913d7ccabf6adab1
public boolean isPickable() {
return false;
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
index 0e6c7284b9aee6c5f2454a3a095ebf349f887740..88e226431bd84747b9fadd68f273432a9efd766e 100644
index 9f843b89dc20b91bf7243facee8486d525e4a1b3..4c5d6e37f7d56436119278bbfad503867d9ccddb 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
@@ -1527,4 +1527,27 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
@@ -1538,4 +1538,27 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
return this.getHandle().getScoreboardName();
}
// Paper end - entity scoreboard name

6
patches/server/0077-Redstone-deactivates-spawners.patch
View File

@@ -5,10 +5,10 @@ Subject: [PATCH] Redstone deactivates spawners
diff --git a/src/main/java/net/minecraft/world/level/BaseSpawner.java b/src/main/java/net/minecraft/world/level/BaseSpawner.java
index 633500aefd515df5dadda3802b94079f75a03fa0..64d911bee1607880514061c75116d8672df8bb8f 100644
index 1279132e2fb3e8f64f062df0ac8b8197f9d8f343..fb933cc388acf26cebe1da692b9c5dd165f797ee 100644
--- a/src/main/java/net/minecraft/world/level/BaseSpawner.java
+++ b/src/main/java/net/minecraft/world/level/BaseSpawner.java
@@ -55,6 +55,7 @@ public abstract class BaseSpawner {
@@ -71,6 +71,7 @@ public abstract class BaseSpawner {
}
public boolean isNearPlayer(Level world, BlockPos pos) {
@@ -17,7 +17,7 @@ index 633500aefd515df5dadda3802b94079f75a03fa0..64d911bee1607880514061c75116d867
}
diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
index 9cd4d38da512f209db7196f632031d51acc5947c..669454dd9ad60116b664f4432f4fef9662ba170c 100644
index 51dd20665e5cdf1e76a63367d75890d4ae8f55b6..8f085e8ba40d3bd9fca27b18b9ee156bbffe6bc3 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -352,6 +352,11 @@ public class PurpurWorldConfig {

6
patches/server/0303-add-an-option-for-piglins-to-ignore-gold-trimmed-arm.patch
View File

@@ -5,10 +5,10 @@ Subject: [PATCH] add an option for piglins to ignore gold-trimmed armor
diff --git a/src/main/java/net/minecraft/world/entity/monster/piglin/PiglinAi.java b/src/main/java/net/minecraft/world/entity/monster/piglin/PiglinAi.java
index 5c13e376dd079134da465044f1057bcce66973a3..8f10ced20d7cdb7020f032c9e37d9bbb38f360d6 100644
index 372d084609216d5437b92ee60810a9efbb0b6f31..a5a7ea0ddad31e3633647f823df86ddbb5fbbcc5 100644
--- a/src/main/java/net/minecraft/world/entity/monster/piglin/PiglinAi.java
+++ b/src/main/java/net/minecraft/world/entity/monster/piglin/PiglinAi.java
@@ -597,20 +597,33 @@ public class PiglinAi {
@@ -598,20 +598,33 @@ public class PiglinAi {
Iterator iterator = iterable.iterator();
Item item;
@@ -45,7 +45,7 @@ index 5c13e376dd079134da465044f1057bcce66973a3..8f10ced20d7cdb7020f032c9e37d9bbb
piglin.getBrain().eraseMemory(MemoryModuleType.WALK_TARGET);
piglin.getNavigation().stop();
diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
index 39236dc4d7c70edff091bb1df54b2158e6dd5e2c..cd7f347e46f4fa08e291bfdbbb01ea4f3271a877 100644
index bb5b1acf54f8347ef19c50f50bc6e9ff90fa87f5..cc9aa6b7a76b1d993f0e3eb3d8e9374fffd87176 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -2205,6 +2205,7 @@ public class PurpurWorldConfig {