Mirrors/Purpur
1
0
Fork 1
mirror of https://github.com/PurpurMC/Purpur.git synced 2026-02-17 08:27: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@b1334b5 Mark Player.sendSignChange as deprecated (#9382)
PaperMC/Paper@2f8d9db Pathfinder hasPath should check if path is done. (#9231)
PaperMC/Paper@46a36d3 Make ExperienceOrb entities call EntitySpawnEvent (#9197)
PaperMC/Paper@24d690f Fix hopper not marking source inv as changed (#9070)
PaperMC/Paper@383f0ed Remove sign ticking (#9478)
PaperMC/Paper@d8b8f61 Configurable Region Compression Format (#8505)
PaperMC/Paper@2c54b39 Don't support hex in book title and author (#9493)
PaperMC/Paper@e19177a Rewrote Amethyst logic to throw both BlockGrowEvent and BlockSpreadEvent (#9217)
PaperMC/Paper@4283054 Add player whitelist events (#9209)
PaperMC/Paper@aa93dcf feat: add minimessage tag resolvers overload to CommandSender#sendMessage (#9505)
This commit is contained in:
granny
2023-07-22 23:26:58 -07:00
parent 8fec60c7bc
commit 7cefa0cafa
8 changed files with 19 additions and 19 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.1-R0.1-SNAPSHOT
mcVersion = 1.20.1
paperCommit = c016e039a5b7c0e86a2862235451b09a315d12cc
paperCommit = aa93dcfdce20fd15837854d6f89d0ba82cdc5c55
org.gradle.caching = true
org.gradle.parallel = true

4
patches/api/0005-Purpur-client-support.patch
View File

@@ -5,10 +5,10 @@ Subject: [PATCH] Purpur client support
diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
index d0297f47f18cabf857cf4ce04c529b46525c0f75..f71e4cc7509db77de9656485cf3f1368ea8ce45b 100644
index 4f710a941954a3d94acabe2a83bee050ad1ff052..864dbde8e9810dcd39abafdced3fc40bc2dfd589 100644
--- a/src/main/java/org/bukkit/entity/Player.java
+++ b/src/main/java/org/bukkit/entity/Player.java
@@ -3153,4 +3153,13 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
@@ -3175,4 +3175,13 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
@Override
Spigot spigot();
// Spigot end

4
patches/api/0010-AFK-API.patch
View File

@@ -5,10 +5,10 @@ Subject: [PATCH] AFK API
diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
index f71e4cc7509db77de9656485cf3f1368ea8ce45b..a38673326d7732e4067dc6aa1af4d0bf2901e843 100644
index 864dbde8e9810dcd39abafdced3fc40bc2dfd589..4f26113e9ee9e0826220cdc8a2f59a2b7afa0c22 100644
--- a/src/main/java/org/bukkit/entity/Player.java
+++ b/src/main/java/org/bukkit/entity/Player.java
@@ -3161,5 +3161,24 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
@@ -3183,5 +3183,24 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
* @return True if Player uses Purpur Client
*/
public boolean usesPurpurClient();

4
patches/api/0016-Player-invulnerabilities.patch
View File

@@ -5,10 +5,10 @@ Subject: [PATCH] Player invulnerabilities
diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
index a38673326d7732e4067dc6aa1af4d0bf2901e843..79d996d9347d4c837401352fda9b7ac673e29b0f 100644
index 4f26113e9ee9e0826220cdc8a2f59a2b7afa0c22..143add524c7f3bca66a36522031ab56ce6ad714b 100644
--- a/src/main/java/org/bukkit/entity/Player.java
+++ b/src/main/java/org/bukkit/entity/Player.java
@@ -3180,5 +3180,26 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
@@ -3202,5 +3202,26 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
* Reset the idle timer back to 0
*/
void resetIdleTimer();

4
patches/api/0045-Debug-Marker-API.patch
View File

@@ -260,10 +260,10 @@ index 1fba792419ea6b5e8c640a2599e4b2dd16ee87d0..bf39c6602cfca70a6352519fa26059cd
/**
diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
index 79d996d9347d4c837401352fda9b7ac673e29b0f..1916730689e8decf16fc1328775ac985ce417256 100644
index 143add524c7f3bca66a36522031ab56ce6ad714b..389d5a30cff2ed81a114a5933dd9e6437543fb41 100644
--- a/src/main/java/org/bukkit/entity/Player.java
+++ b/src/main/java/org/bukkit/entity/Player.java
@@ -3201,5 +3201,75 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
@@ -3223,5 +3223,75 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
* @param invulnerableTicks Invulnerable ticks remaining
*/
void setSpawnInvulnerableTicks(int invulnerableTicks);

4
patches/api/0046-Add-death-screen-API.patch
View File

@@ -5,10 +5,10 @@ Subject: [PATCH] Add death screen API
diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
index 1916730689e8decf16fc1328775ac985ce417256..0c7b2434d7ae0314f9603e04f1bedd67f3b22b66 100644
index 389d5a30cff2ed81a114a5933dd9e6437543fb41..74a9e27b8d3147876483743e1107632e332b0571 100644
--- a/src/main/java/org/bukkit/entity/Player.java
+++ b/src/main/java/org/bukkit/entity/Player.java
@@ -3271,5 +3271,25 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
@@ -3293,5 +3293,25 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
* Clears all debug block highlights
*/
void clearBlockHighlights();

8
patches/server/0001-Pufferfish-Server-Changes.patch
View File

@@ -3109,7 +3109,7 @@ index a71414397bd45ee7bcacfeef0041d80dfa25f114..d66806565770cb03a21794f99e5c4b0f
@Override
diff --git a/src/main/java/net/minecraft/world/level/block/entity/HopperBlockEntity.java b/src/main/java/net/minecraft/world/level/block/entity/HopperBlockEntity.java
index a8a26a0a37a08b6bbeb5a1fde417d6f448d3c79f..87164ca253447188cfc76073f7c73949cb0b3e03 100644
index b11f51762ca289d99eaa49e66e31e58595bcea4e..f03608a133338b0f5522a07239e06fd2245db1e5 100644
--- a/src/main/java/net/minecraft/world/level/block/entity/HopperBlockEntity.java
+++ b/src/main/java/net/minecraft/world/level/block/entity/HopperBlockEntity.java
@@ -47,7 +47,10 @@ public class HopperBlockEntity extends RandomizableContainerBlockEntity implemen
@@ -3172,7 +3172,7 @@ index a8a26a0a37a08b6bbeb5a1fde417d6f448d3c79f..87164ca253447188cfc76073f7c73949
flag |= booleansupplier.getAsBoolean();
}
@@ -451,11 +477,18 @@ public class HopperBlockEntity extends RandomizableContainerBlockEntity implemen
@@ -452,11 +478,18 @@ public class HopperBlockEntity extends RandomizableContainerBlockEntity implemen
}
private static boolean isFullContainer(Container inventory, Direction direction) {
@@ -3193,7 +3193,7 @@ index a8a26a0a37a08b6bbeb5a1fde417d6f448d3c79f..87164ca253447188cfc76073f7c73949
}
public static boolean suckInItems(Level world, Hopper hopper) {
@@ -636,7 +669,7 @@ public class HopperBlockEntity extends RandomizableContainerBlockEntity implemen
@@ -637,7 +670,7 @@ public class HopperBlockEntity extends RandomizableContainerBlockEntity implemen
if (HopperBlockEntity.canPlaceItemInContainer(to, stack, slot, side)) {
boolean flag = false;
@@ -3202,7 +3202,7 @@ index a8a26a0a37a08b6bbeb5a1fde417d6f448d3c79f..87164ca253447188cfc76073f7c73949
if (itemstack1.isEmpty()) {
// Spigot start - SPIGOT-6693, InventorySubcontainer#setItem
@@ -831,7 +864,10 @@ public class HopperBlockEntity extends RandomizableContainerBlockEntity implemen
@@ -832,7 +865,10 @@ public class HopperBlockEntity extends RandomizableContainerBlockEntity implemen
@Override
protected void setItems(NonNullList<ItemStack> list) {

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

@@ -5221,7 +5221,7 @@ index fc0dc8e607cc24020106ea1af92b4421a5f9393d..7d744d5b6a9e593e657233b2192f2837
+ // Purpur end
}
diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
index 9b9a9606e5be94b394606f2306e7b7a5ed781e1d..5b101451e08b6685b192727d488e879c4123e401 100644
index acb38f927c2418c91adf91c7b790ea6869835537..f1479e5a3cbccd34edfb22d3c1c3ea0a7438926b 100644
--- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
+++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
@@ -565,6 +565,15 @@ public class CraftEventFactory {
@@ -5240,7 +5240,7 @@ index 9b9a9606e5be94b394606f2306e7b7a5ed781e1d..5b101451e08b6685b192727d488e879c
return event;
}
@@ -1002,6 +1011,7 @@ public class CraftEventFactory {
@@ -1005,6 +1014,7 @@ public class CraftEventFactory {
damageCause = DamageCause.ENTITY_EXPLOSION;
}
event = new EntityDamageByEntityEvent(damager.getBukkitEntity(), entity.getBukkitEntity(), damageCause, modifiers, modifierFunctions, source.isCritical()); // Paper - add critical damage API
@@ -5248,7 +5248,7 @@ index 9b9a9606e5be94b394606f2306e7b7a5ed781e1d..5b101451e08b6685b192727d488e879c
}
event.setCancelled(cancelled);
@@ -1116,6 +1126,7 @@ public class CraftEventFactory {
@@ -1119,6 +1129,7 @@ public class CraftEventFactory {
} else {
entity.lastDamageCancelled = true; // SPIGOT-5339, SPIGOT-6252, SPIGOT-6777: Keep track if the event was canceled
}
@@ -5256,7 +5256,7 @@ index 9b9a9606e5be94b394606f2306e7b7a5ed781e1d..5b101451e08b6685b192727d488e879c
return event;
}
@@ -1179,6 +1190,7 @@ public class CraftEventFactory {
@@ -1182,6 +1193,7 @@ public class CraftEventFactory {
EntityDamageEvent event;
if (damager != null) {
event = new EntityDamageByEntityEvent(damager.getBukkitEntity(), damagee.getBukkitEntity(), cause, modifiers, modifierFunctions, critical); // Paper - add critical damage API