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@1765917 Fix creating the reverse map for loot table keys (#9766)
PaperMC/Paper@4cdbb0c Updated Upstream (Bukkit/CraftBukkit/Spigot)
PaperMC/Paper@0f69290 [ci skip] Fix typo (important)
PaperMC/Paper@c4ba28a Don't throw when removing unplaced player in NearbyPlayers
PaperMC/Paper@38376f4 Some jd fixes (#9781)
  • Loading branch information
granny committed Oct 1, 2023
1 parent 9b8e853 commit 7f191a3
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 5 deletions.
2 changes: 1 addition & 1 deletion gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ group = org.purpurmc.purpur
version = 1.20.2-R0.1-SNAPSHOT

mcVersion = 1.20.2
paperCommit = fe54a13b1301312304d9c1e46ad91b039657120b
paperCommit = 38376f43a0c268e5223746cab13910f55e5ecf41

org.gradle.caching = true
org.gradle.parallel = true
Expand Down
10 changes: 6 additions & 4 deletions patches/server/0297-Stored-Bee-API.patch
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ index 7b82842b97ce795745cf6ee6399f618c55acbbf3..82bdd430f1640e44d25af54354bba27b
int exitTickCounter; // Paper - separate counter for checking if bee should exit to reduce exit attempts
final int minOccupationTicks;
diff --git a/src/main/java/org/bukkit/craftbukkit/block/CraftBeehive.java b/src/main/java/org/bukkit/craftbukkit/block/CraftBeehive.java
index 380897c010521f368848a3e6986d307cf47ff319..eed465160220f0e080ff3f9fa26be790a1cb65bb 100644
index 2b906fccdb0a5ecddaf487ee931d05b511f84351..2bf30db1c4af5291edc19451108437a39d9a6ec8 100644
--- a/src/main/java/org/bukkit/craftbukkit/block/CraftBeehive.java
+++ b/src/main/java/org/bukkit/craftbukkit/block/CraftBeehive.java
@@ -16,8 +16,15 @@ import org.bukkit.entity.Bee;
Expand All @@ -92,8 +92,8 @@ index 380897c010521f368848a3e6986d307cf47ff319..eed465160220f0e080ff3f9fa26be790
+ // Purpur end
}

@Override
@@ -66,25 +73,67 @@ public class CraftBeehive extends CraftBlockEntityState<BeehiveBlockEntity> impl
protected CraftBeehive(CraftBeehive state) {
@@ -70,20 +77,61 @@ public class CraftBeehive extends CraftBlockEntityState<BeehiveBlockEntity> impl
List<Bee> bees = new ArrayList<>();

if (isPlaced()) {
Expand Down Expand Up @@ -156,7 +156,9 @@ index 380897c010521f368848a3e6986d307cf47ff319..eed465160220f0e080ff3f9fa26be790
+ }
+ // Purpur end
}
// Paper start - Add EntityBlockStorage clearEntities

@Override
@@ -95,6 +143,7 @@ public class CraftBeehive extends CraftBlockEntityState<BeehiveBlockEntity> impl
@Override
public void clearEntities() {
getSnapshot().clearBees();
Expand Down

0 comments on commit 7f191a3

Please sign in to comment.