Skip to content

Commit

Permalink
Updated Upstream (Paper)
Browse files Browse the repository at this point in the history
Upstream has released updates that appear to apply and compile correctly

Paper Changes:
PaperMC/Paper@99aa5f2 Fixes parsing tags in selectors in command functions
PaperMC/Paper@698b315 Improve migration file errors (#7929)
PaperMC/Paper@8bca919 Remove unneeded patch
PaperMC/Paper@a8a01bb port Significantly improve performance of the end generation (#7919)
PaperMC/Paper@cf384f5 Don't print stacktrace when client with invalid signature logs in
PaperMC/Paper@9b6fb2f Remove bad warning
PaperMC/Paper@0754819 Updated Upstream (CraftBukkit)
PaperMC/Paper@9a75a79 Readd PlayerAnimationEvent constructor removed by upstream
  • Loading branch information
BillyGalbreath committed Jun 10, 2022
1 parent a679c88 commit 4a04914
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 9 deletions.
2 changes: 1 addition & 1 deletion gradle.properties
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
group = org.purpurmc.purpur
version = 1.19-R0.1-SNAPSHOT

paperCommit = 8141349df1caad090401c3960cdf97a90ba7a50d
paperCommit = 99aa5f2fa57ccc17f936d51097d2b01504aa72dd

org.gradle.caching = true
org.gradle.parallel = true
Expand Down
12 changes: 6 additions & 6 deletions patches/server/0066-Item-entity-immunities.patch
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,10 @@ Subject: [PATCH] Item entity immunities


diff --git a/src/main/java/net/minecraft/server/level/ChunkMap.java b/src/main/java/net/minecraft/server/level/ChunkMap.java
index a78cc85ba2acca982097317d56e7074c6042effd..67cb760da4683c7031e51766a8f928eadd937de0 100644
index d98c489a58c8c2e657a8879b991aa57ef78f5015..8a36478ae555d3becf6e210092854221d3428cd2 100644
--- a/src/main/java/net/minecraft/server/level/ChunkMap.java
+++ b/src/main/java/net/minecraft/server/level/ChunkMap.java
@@ -2269,7 +2269,7 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
@@ -2275,7 +2275,7 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider

public class TrackedEntity {

Expand All @@ -18,7 +18,7 @@ index a78cc85ba2acca982097317d56e7074c6042effd..67cb760da4683c7031e51766a8f928ea
private final int range;
SectionPos lastSectionPos;
diff --git a/src/main/java/net/minecraft/server/level/ServerEntity.java b/src/main/java/net/minecraft/server/level/ServerEntity.java
index 0bc963fc214da203a6e505fdd5edee3b1efc03df..d8cb1d7cdd2d0ab28eaf3c91a0316af102f702e1 100644
index 946cde51334568c62d9546254a8d4e5d46d95324..854e68c3d4b714e8b68eeec95e90fac9ecf7a517 100644
--- a/src/main/java/net/minecraft/server/level/ServerEntity.java
+++ b/src/main/java/net/minecraft/server/level/ServerEntity.java
@@ -65,7 +65,7 @@ public class ServerEntity {
Expand All @@ -31,7 +31,7 @@ index 0bc963fc214da203a6e505fdd5edee3b1efc03df..d8cb1d7cdd2d0ab28eaf3c91a0316af1
public ServerEntity(ServerLevel worldserver, Entity entity, int i, boolean flag, Consumer<Packet<?>> consumer, Set<ServerPlayerConnection> trackedPlayers) {
this.trackedPlayers = trackedPlayers;
diff --git a/src/main/java/net/minecraft/world/entity/item/ItemEntity.java b/src/main/java/net/minecraft/world/entity/item/ItemEntity.java
index 7e927dec3e4e4fb65bf89a87cfa555045c58bb3a..fcdcdc54bf58ed159695990a3c05486b87a96a35 100644
index ae4b251e10babb07055d031ff48ac7dd5d4be4a0..1e9f3d5f52a34a9ce70f6e57ad53a24df5e22c4b 100644
--- a/src/main/java/net/minecraft/world/entity/item/ItemEntity.java
+++ b/src/main/java/net/minecraft/world/entity/item/ItemEntity.java
@@ -55,6 +55,12 @@ public class ItemEntity extends Entity {
Expand All @@ -47,7 +47,7 @@ index 7e927dec3e4e4fb65bf89a87cfa555045c58bb3a..fcdcdc54bf58ed159695990a3c05486b

public ItemEntity(EntityType<? extends ItemEntity> type, Level world) {
super(type, world);
@@ -332,6 +338,15 @@ public class ItemEntity extends Entity {
@@ -328,6 +334,15 @@ public class ItemEntity extends Entity {
return false;
} else if (!this.getItem().getItem().canBeHurtBy(source)) {
return false;
Expand All @@ -63,7 +63,7 @@ index 7e927dec3e4e4fb65bf89a87cfa555045c58bb3a..fcdcdc54bf58ed159695990a3c05486b
} else if (this.level.isClientSide) {
return true;
} else {
@@ -517,6 +532,12 @@ public class ItemEntity extends Entity {
@@ -513,6 +528,12 @@ public class ItemEntity extends Entity {
this.getEntityData().set(ItemEntity.DATA_ITEM, stack);
this.getEntityData().markDirty(ItemEntity.DATA_ITEM); // CraftBukkit - SPIGOT-4591, must mark dirty
this.despawnRate = level.paperConfig().entities.spawning.altItemDespawnRate.enabled ? level.paperConfig().entities.spawning.altItemDespawnRate.items.getOrDefault(stack.getItem(), level.spigotConfig.itemDespawnRate) : level.spigotConfig.itemDespawnRate; // Paper
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,10 @@ Subject: [PATCH] Dont eat blocks in non ticking chunks


diff --git a/src/main/java/net/minecraft/server/level/ChunkMap.java b/src/main/java/net/minecraft/server/level/ChunkMap.java
index 67cb760da4683c7031e51766a8f928eadd937de0..ef501b2a84511ff5d7be0eb2dedce293eff2bb4c 100644
index 8a36478ae555d3becf6e210092854221d3428cd2..1f73174c097695afbd63b01b2ecbceaa3bbbc77e 100644
--- a/src/main/java/net/minecraft/server/level/ChunkMap.java
+++ b/src/main/java/net/minecraft/server/level/ChunkMap.java
@@ -1820,7 +1820,7 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
@@ -1826,7 +1826,7 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
return this.anyPlayerCloseEnoughForSpawning(this.getUpdatingChunkIfPresent(chunkcoordintpair.toLong()), chunkcoordintpair, reducedRange);
}

Expand Down

0 comments on commit 4a04914

Please sign in to comment.