Mirrors/Purpur
1
0
Fork 1
mirror of https://github.com/PurpurMC/Purpur.git synced 2026-02-19 01:17:42 +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@36a5f15 Allow preventing BlockDestroyEvent from dropping items (#8349)
This commit is contained in:
BillyGalbreath
2022-09-09 12:32:30 -05:00
parent 6dc65d28c6
commit 5f14c32a66
5 changed files with 16 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
gradle.properties
View File

@@ -1,7 +1,7 @@
group = org.purpurmc.purpur
version = 1.19.2-R0.1-SNAPSHOT
paperCommit = 09904fd780175821a43adf74cc5a00d363e4a83d
paperCommit = 36a5f150c550d03ea24cbc5b1bcc1993a44cb2eb
org.gradle.caching = true
org.gradle.parallel = true

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

@@ -4850,7 +4850,7 @@ index 468c635d31cfa8051666bbefce8df4b448e9ed93..17e869074b8cf29a8c3280499a27e951
final String id;
private final GameRules.Category category;
diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java
index 5a2a1d394852d39ea576624586f7fa736dec807c..0681a7499755b573c191804b38ac8783eb7d0f32 100644
index ceb1f18ec16ddcda792ef0393b5f4649fbef3017..388a153113d87ba99515828c6d535110b4413c7c 100644
--- a/src/main/java/net/minecraft/world/level/Level.java
+++ b/src/main/java/net/minecraft/world/level/Level.java
@@ -271,6 +271,17 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
@@ -4977,7 +4977,7 @@ index 5a2a1d394852d39ea576624586f7fa736dec807c..0681a7499755b573c191804b38ac8783
public boolean isInWorldBounds(BlockPos pos) {
return pos.isInsideBuildHeightAndWorldBoundsHorizontal(this); // Paper - use better/optimized check
}
@@ -896,13 +999,13 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
@@ -897,13 +1000,13 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
try {
tickConsumer.accept(entity);
MinecraftServer.getServer().executeMidTickTasks(); // Paper - execute chunk tasks mid tick
@@ -4993,7 +4993,7 @@ index 5a2a1d394852d39ea576624586f7fa736dec807c..0681a7499755b573c191804b38ac8783
// Paper end
}
}
@@ -1388,6 +1491,7 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
@@ -1389,6 +1492,7 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
}
public ProfilerFiller getProfiler() {

4
patches/server/0076-Add-allow-water-in-end-world-option.patch
View File

@@ -27,10 +27,10 @@ index 73f1211470d9626c82c8345037da19aed9db3f23..40c7bf266eccc43faa081ade9402bee5
return true;
diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java
index 9d68706d23da00700a89b533e9efefa328196064..a249430e34addd26a3fb49913ea9efe0f3d1b7b6 100644
index 544f7ff70486c31e9caddf574265a42c07af3166..67c06003c5f6659409baef7157cceba5a98ac1c2 100644
--- a/src/main/java/net/minecraft/world/level/Level.java
+++ b/src/main/java/net/minecraft/world/level/Level.java
@@ -1570,4 +1570,14 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
@@ -1571,4 +1571,14 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
return null;
}
// Paper end

6
patches/server/0288-Remove-Timings.patch
View File

@@ -887,10 +887,10 @@ index 210b0cdd4831421c8f43c3d823ac8e962b56bbbc..de99946f5215ff2c78d6df5b8b7d5b6a
chunkcoordintpair.x, chunkcoordintpair.z, data, null, com.destroystokyo.paper.io.PrioritizedTaskQueue.NORMAL_PRIORITY);
}
diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java
index 824f3dfaf2ba6f064efaa7939b990023de1f1448..582613e9c45135b2cc0c02f457e5c3d61d138c86 100644
index c5dac52a23d9df26cacb869fd841da9bf518c313..bd89e00f707b6ba297081c9aacb3c5463e80063e 100644
--- a/src/main/java/net/minecraft/world/level/Level.java
+++ b/src/main/java/net/minecraft/world/level/Level.java
@@ -994,15 +994,15 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
@@ -995,15 +995,15 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
ProfilerFiller gameprofilerfiller = this.getProfiler();
gameprofilerfiller.push("blockEntities");
@@ -909,7 +909,7 @@ index 824f3dfaf2ba6f064efaa7939b990023de1f1448..582613e9c45135b2cc0c02f457e5c3d6
// Spigot start
// Iterator iterator = this.blockEntityTickers.iterator();
int tilesThisCycle = 0;
@@ -1035,7 +1035,7 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
@@ -1036,7 +1036,7 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
}
this.blockEntityTickers.removeAll(toRemove);

14
patches/server/0289-Remove-Mojang-Profiler.patch
View File

@@ -1061,7 +1061,7 @@ index 5725c6593480fada65facc29664a00a8cc073512..ccb1f998ae3122d1856d77149ff7e7df
};
}
diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
index cca820e0a13311ffbc0905400ec8d980c8f2b539..ab3f5d8df443f1f23f4cf11af46ed4c95ff30f0e 100644
index 59905d8d5e446ff694fe70edec8df1d92e27aa40..0cdac68d20a77948ef7dd4072b3db039e280c567 100644
--- a/src/main/java/net/minecraft/world/entity/Entity.java
+++ b/src/main/java/net/minecraft/world/entity/Entity.java
@@ -821,7 +821,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
@@ -1730,7 +1730,7 @@ index 01477e7240f9e33d08d416a7d40ee10f3e5d4abf..c9def2202d7c2a523858ec124df2beaf
}
diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java
index 582613e9c45135b2cc0c02f457e5c3d61d138c86..018a5c13d3f0321d4346e6c1845f1aed2b8de3dd 100644
index bd89e00f707b6ba297081c9aacb3c5463e80063e..5e0fb02ccd1204a72b2d730a25e35844a07c5759 100644
--- a/src/main/java/net/minecraft/world/level/Level.java
+++ b/src/main/java/net/minecraft/world/level/Level.java
@@ -713,9 +713,9 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
@@ -1745,7 +1745,7 @@ index 582613e9c45135b2cc0c02f457e5c3d61d138c86..018a5c13d3f0321d4346e6c1845f1aed
}
/*
@@ -991,9 +991,9 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
@@ -992,9 +992,9 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
}
protected void tickBlockEntities() {
@@ -1757,7 +1757,7 @@ index 582613e9c45135b2cc0c02f457e5c3d61d138c86..018a5c13d3f0321d4346e6c1845f1aed
//timings.tileEntityPending.startTiming(); // Spigot // Purpur
this.tickingBlockEntities = true;
if (!this.pendingBlockEntityTickers.isEmpty()) {
@@ -1038,7 +1038,7 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
@@ -1039,7 +1039,7 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
//timings.tileEntityTick.stopTiming(); // Spigot // Purpur
this.tickingBlockEntities = false;
co.aikar.timings.TimingHistory.tileEntityTicks += this.blockEntityTickers.size(); // Paper
@@ -1766,7 +1766,7 @@ index 582613e9c45135b2cc0c02f457e5c3d61d138c86..018a5c13d3f0321d4346e6c1845f1aed
spigotConfig.currentPrimedTnt = 0; // Spigot
}
@@ -1199,7 +1199,7 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
@@ -1200,7 +1200,7 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
@Override
public List<Entity> getEntities(@Nullable Entity except, AABB box, Predicate<? super Entity> predicate) {
@@ -1775,7 +1775,7 @@ index 582613e9c45135b2cc0c02f457e5c3d61d138c86..018a5c13d3f0321d4346e6c1845f1aed
List<Entity> list = Lists.newArrayList();
this.entitySliceManager.getEntities(except, box, list, predicate); // Paper - optimise this call
return list;
@@ -1207,7 +1207,7 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
@@ -1208,7 +1208,7 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
@Override
public <T extends Entity> List<T> getEntities(EntityTypeTest<Entity, T> filter, AABB box, Predicate<? super T> predicate) {
@@ -1784,7 +1784,7 @@ index 582613e9c45135b2cc0c02f457e5c3d61d138c86..018a5c13d3f0321d4346e6c1845f1aed
List<T> list = Lists.newArrayList();
// Paper start - optimise this call
@@ -1538,7 +1538,7 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
@@ -1539,7 +1539,7 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
}
public ProfilerFiller getProfiler() {