Skip to content

Commit f1c5e3f

Browse files
minhh2792minhh2792
committed
Upstream
1 parent 48f39b3 commit f1c5e3f

12 files changed

+36
-36
lines changed

‎gradle.properties

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ org.gradle.caching = true
22
org.gradle.parallel = true
33
org.gradle.vfs.watch = false
44

5-
pufferfishCommit = a593bf65ce8bb1dc7983679766609345d1798a97
5+
pufferfishCommit = f6aa872dbfbb7c36c81d2043f4997c41fc0d065d
66

77
group = me.minhh2792.pearl
88
version = 1.19-R0.1-SNAPSHOT

‎patches/api/0001-Skip-event-if-no-listeners.patch

+3-3
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,10 @@ Original code by Titaniumtown, licensed under GNU General Public License v3.0
77
You can find the original code on https://gitlab.com/Titaniumtown/JettPack
88

99
diff --git a/src/main/java/org/bukkit/plugin/SimplePluginManager.java b/src/main/java/org/bukkit/plugin/SimplePluginManager.java
10-
index aed2209b66f11a0d03473cf19437f3da0e9e573a..9aee6ec65abf059cb9c40ed318f0995813940335 100644
10+
index 6aba652af2b2f054ad22c77e4e59f0ed3eddc685..2ea16249a2fa6dbeb59fa51e48b3ab4fa4ba9c9e 100644
1111
--- a/src/main/java/org/bukkit/plugin/SimplePluginManager.java
1212
+++ b/src/main/java/org/bukkit/plugin/SimplePluginManager.java
13-
@@ -647,6 +647,14 @@ public final class SimplePluginManager implements PluginManager {
13+
@@ -652,6 +652,14 @@ public final class SimplePluginManager implements PluginManager {
1414
*/
1515
@Override
1616
public void callEvent(@NotNull Event event) {
@@ -25,7 +25,7 @@ index aed2209b66f11a0d03473cf19437f3da0e9e573a..9aee6ec65abf059cb9c40ed318f09958
2525
// Paper - replace callEvent by merging to below method
2626
if (event.isAsynchronous() && server.isPrimaryThread()) {
2727
throw new IllegalStateException(event.getEventName() + " may only be triggered asynchronously.");
28-
@@ -654,8 +662,8 @@ public final class SimplePluginManager implements PluginManager {
28+
@@ -659,8 +667,8 @@ public final class SimplePluginManager implements PluginManager {
2929
throw new IllegalStateException(event.getEventName() + " may only be triggered synchronously.");
3030
}
3131

‎patches/server/0001-Pearl-Rebrand.patch

+4-4
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ Subject: [PATCH] Pearl Rebrand
55

66

77
diff --git a/build.gradle.kts b/build.gradle.kts
8-
index a4a146d9c3e07bdf941d81147ca31daf4689a687..f8d693a777f61d7c3482772a7cad193741fd0c13 100644
8+
index 74c91f79576e85618fefb79be8d313ba871701c7..1b90dfa67a95e43da18a5ba07a8f99d04afe47b2 100644
99
--- a/build.gradle.kts
1010
+++ b/build.gradle.kts
1111
@@ -9,7 +9,7 @@ plugins {
@@ -188,7 +188,7 @@ index 0000000000000000000000000000000000000000..da88a794ffabc78209aad1b0d91cf5ba
188188
+ }
189189
+}
190190
diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
191-
index e96ff8b13b1237d7c70359b78e4d72938877191f..79799ed7f554e0c8539b918abcaa7d33150f360b 100644
191+
index 7fd7c3be306d93201a61bb616f8c09cb066d4204..8c7282a7a9b06ddd31e7cb449e5857666a7ce239 100644
192192
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
193193
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
194194
@@ -910,7 +910,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@@ -223,10 +223,10 @@ index c31b9a6b1d4548d507ecb60d42ca9f96f49f6c4b..d89d3d26a83a7cafac2958d9447c35a0
223223

224224
private static final int DEFAULT_SIZE_THRESHOLD = 1024 * 8;
225225
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
226-
index 33218552405c526955d30031469d3044c724dde3..8a641c5e434e2f3b86da3a64266aed3fdc820a56 100644
226+
index b5de069683a615be9b9b33c3d8e61e46bbbec8e3..5a37187090ba5216c487eda04b7fc26fa2a14dea 100644
227227
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
228228
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
229-
@@ -245,7 +245,7 @@ import javax.annotation.Nullable; // Paper
229+
@@ -246,7 +246,7 @@ import javax.annotation.Nullable; // Paper
230230
import javax.annotation.Nonnull; // Paper
231231

232232
public final class CraftServer implements Server {

‎patches/server/0005-Swap-the-predicate-order-of-collision.patch

+3-3
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,10 @@ Original code by Akarin-project, licensed under GNU General Public License v3.0
88
You can find the original code on https://github.com/Akarin-project/Akarin
99

1010
diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
11-
index e6d25ab2e7e19d9fb993fdad6f650212f560cc1d..8ecf75dd1a118cb0250dd91a56ab6e340482d8ba 100644
11+
index beab9f74ba3c3ef294485ee74daf165475d29566..247c8e23b80e8563ab4dce31673b80eb225fd08a 100644
1212
--- a/src/main/java/net/minecraft/world/entity/Entity.java
1313
+++ b/src/main/java/net/minecraft/world/entity/Entity.java
14-
@@ -1957,8 +1957,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
14+
@@ -1958,8 +1958,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
1515
public void playerTouch(Player player) {}
1616

1717
public void push(Entity entity) {
@@ -21,7 +21,7 @@ index e6d25ab2e7e19d9fb993fdad6f650212f560cc1d..8ecf75dd1a118cb0250dd91a56ab6e34
2121
if (this.level.paperConfig().collisions.onlyPlayersCollide && !(entity instanceof ServerPlayer || this instanceof ServerPlayer)) return; // Paper
2222
double d0 = entity.getX() - this.getX();
2323
double d1 = entity.getZ() - this.getZ();
24-
@@ -1987,7 +1986,6 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
24+
@@ -1988,7 +1987,6 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
2525
}
2626
}
2727

‎patches/server/0006-Remove-Spigot-tick-limiter.patch

+4-4
Original file line numberDiff line numberDiff line change
@@ -9,11 +9,11 @@ You can find the original code on https://gitlab.com/Titaniumtown/JettPack
99
Please read: https://aikar.co/2015/10/08/spigot-tick-limiter-dont-use-max-tick-time/
1010

1111
diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java
12-
index e845d4af797b8eeb75ab094e1cb1062c7ab2d8b9..16609cd94ae62f1e6d92255a1894ef778efb2ae0 100644
12+
index a2a0bc4874a031c964a5cdb5bc26494cd01351eb..c05903dfb1bd3b52a19a2e430be750580609b8da 100644
1313
--- a/src/main/java/net/minecraft/world/level/Level.java
1414
+++ b/src/main/java/net/minecraft/world/level/Level.java
15-
@@ -177,8 +177,10 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
16-
15+
@@ -176,8 +176,10 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
16+
public final com.destroystokyo.paper.antixray.ChunkPacketBlockController chunkPacketBlockController; // Paper - Anti-Xray
1717
public final co.aikar.timings.WorldTimingsHandler timings; // Paper
1818
public static BlockPos lastPhysicsProblem; // Spigot
1919
- private org.spigotmc.TickLimiter entityLimiter;
@@ -25,7 +25,7 @@ index e845d4af797b8eeb75ab094e1cb1062c7ab2d8b9..16609cd94ae62f1e6d92255a1894ef77
2525
private int tileTickPosition;
2626
public final Map<Explosion.CacheKey, Float> explosionDensityCache = new HashMap<>(); // Paper - Optimize explosions
2727
public java.util.ArrayDeque<net.minecraft.world.level.block.RedstoneTorchBlock.Toggle> redstoneUpdateInfos; // Paper - Move from Map in BlockRedstoneTorch to here
28-
@@ -372,8 +374,10 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
28+
@@ -371,8 +373,10 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
2929
// CraftBukkit end
3030
timings = new co.aikar.timings.WorldTimingsHandler(this); // Paper - code below can generate new world and access timings
3131
this.keepSpawnInMemory = this.paperConfig().spawn.keepSpawnLoaded; // Paper

‎patches/server/0012-Packet-obfuscation-and-reduction.patch

+6-6
Original file line numberDiff line numberDiff line change
@@ -131,10 +131,10 @@ index 1d88edfd09a909044f6e3175af652914b4d06311..92cd6e5b2644738cf0a5076d87d77ca6
131131
}
132132
}
133133
diff --git a/src/main/java/net/minecraft/server/level/ServerEntity.java b/src/main/java/net/minecraft/server/level/ServerEntity.java
134-
index 1eb912ad97f9663bf6bd336ad739f2552b0a5c9b..7085048ff19de42a7ecb8abe1c92106e95a8cc16 100644
134+
index 871bce7f5acc1b9a058496f41d962ec2e724f620..34d3be707249db7ef2ae8efb8f512da654ce1f86 100644
135135
--- a/src/main/java/net/minecraft/server/level/ServerEntity.java
136136
+++ b/src/main/java/net/minecraft/server/level/ServerEntity.java
137-
@@ -362,7 +362,18 @@ public class ServerEntity {
137+
@@ -366,7 +366,18 @@ public class ServerEntity {
138138
SynchedEntityData datawatcher = this.entity.getEntityData();
139139

140140
if (datawatcher.isDirty()) {
@@ -155,10 +155,10 @@ index 1eb912ad97f9663bf6bd336ad739f2552b0a5c9b..7085048ff19de42a7ecb8abe1c92106e
155155

156156
if (this.entity instanceof LivingEntity) {
157157
diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
158-
index 8ecf75dd1a118cb0250dd91a56ab6e340482d8ba..97655d1b7f521a2fa9547cef08a0f400f00b53c7 100644
158+
index 247c8e23b80e8563ab4dce31673b80eb225fd08a..4e1424fd01b14ccafbe7a4919d634fbe83653656 100644
159159
--- a/src/main/java/net/minecraft/world/entity/Entity.java
160160
+++ b/src/main/java/net/minecraft/world/entity/Entity.java
161-
@@ -3099,7 +3099,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
161+
@@ -3108,7 +3108,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
162162
this.entityData.markDirty(Entity.DATA_AIR_SUPPLY_ID);
163163
return;
164164
}
@@ -181,10 +181,10 @@ index cd9cbfa5ef94994b3f7f2ecdde843620e7e6c071..b22e4068407f3012b62683abd0605098
181181

182182
public void startAutoSpinAttack(int riptideTicks) {
183183
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
184-
index abcce6bd0b32d0188751393a6f56f2e82530912c..4af9a1ff02eca0d21dbe02b3eed31c369c2817aa 100644
184+
index 287520f91e22309e1268be1940e0fafb628980a9..657c8a9181d75bdbbdb19196c91c45dc68bdd053 100644
185185
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
186186
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
187-
@@ -2193,7 +2193,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
187+
@@ -2200,7 +2200,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
188188
this.sendHealthUpdate();
189189
}
190190
}

‎patches/server/0014-Don-t-send-fire-packets-if-player-has-Fire-Resistanc.patch

+2-2
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,10 @@ Original code by Cryptite, licensed under MIT License
77
You can find the original code on https://github.com/Cryptite/Slice
88

99
diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
10-
index 97655d1b7f521a2fa9547cef08a0f400f00b53c7..849e47c107a8233a2e8f5a52ff753c45225c160a 100644
10+
index 4e1424fd01b14ccafbe7a4919d634fbe83653656..18be18c6960d8580c7ae8da86eb7b797e5086997 100644
1111
--- a/src/main/java/net/minecraft/world/entity/Entity.java
1212
+++ b/src/main/java/net/minecraft/world/entity/Entity.java
13-
@@ -876,7 +876,11 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
13+
@@ -877,7 +877,11 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
1414

1515
this.checkOutOfWorld();
1616
if (!this.level.isClientSide) {

‎patches/server/0019-Fix-the-dead-lagging-the-server.patch

+3-3
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,10 @@ Original code by PurpurMC, licensed under MIT License
77
You can find the original code on https://github.com/PurpurMC/Purpur
88

99
diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
10-
index 849e47c107a8233a2e8f5a52ff753c45225c160a..8c9cd527f9d37e60cb53247efbd5e78398c69c53 100644
10+
index 18be18c6960d8580c7ae8da86eb7b797e5086997..8542a26068a0ddaed9f886e7d572c5b578c0e438 100644
1111
--- a/src/main/java/net/minecraft/world/entity/Entity.java
1212
+++ b/src/main/java/net/minecraft/world/entity/Entity.java
13-
@@ -1874,6 +1874,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
13+
@@ -1875,6 +1875,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
1414
this.yRotO = this.getYRot();
1515
this.xRotO = this.getXRot();
1616
this.setYHeadRot(yaw); // Paper - Update head rotation
@@ -19,7 +19,7 @@ index 849e47c107a8233a2e8f5a52ff753c45225c160a..8c9cd527f9d37e60cb53247efbd5e783
1919

2020
public void absMoveTo(double x, double y, double z) {
2121
diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
22-
index 3fadae80cfad24b528cfe710330992d310ff2f1d..e979889e7a650776f7c7aabd139e4018b2b5ecf4 100644
22+
index 18c17a195897b209db545e0661c193ed4b02afc1..7e098e6653bb727e53a689450924fcb9c892de25 100644
2323
--- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
2424
+++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
2525
@@ -2967,7 +2967,7 @@ public abstract class LivingEntity extends Entity {

‎patches/server/0023-Disable-outdated-build-check.patch

+2-2
Original file line numberDiff line numberDiff line change
@@ -7,14 +7,14 @@ Original code by PurpurMC, licensed under MIT License
77
You can find the original code on https://github.com/PurpurMC/Purpur
88

99
diff --git a/src/main/java/org/bukkit/craftbukkit/Main.java b/src/main/java/org/bukkit/craftbukkit/Main.java
10-
index fbd604602024522bdd73aa1bde6fe2ccec63e442..ade7e6858b1683a3aa6c2fba9e8b3e4c35c3c4c5 100644
10+
index c55ae77807e0ec3698f0d0443caaf18928b41017..cdc546fa12823edb065f3f30bbd640728f2b52db 100644
1111
--- a/src/main/java/org/bukkit/craftbukkit/Main.java
1212
+++ b/src/main/java/org/bukkit/craftbukkit/Main.java
1313
@@ -262,7 +262,7 @@ public class Main {
1414
System.setProperty(TerminalConsoleAppender.JLINE_OVERRIDE_PROPERTY, "false"); // Paper
1515
}
1616

17-
- if (Main.class.getPackage().getImplementationVendor() != null && System.getProperty("IReallyKnowWhatIAmDoingISwear") == null) {
17+
- if (false && Main.class.getPackage().getImplementationVendor() != null && System.getProperty("IReallyKnowWhatIAmDoingISwear") == null) {
1818
+ if (false && Main.class.getPackage().getImplementationVendor() != null && System.getProperty("IReallyKnowWhatIAmDoingISwear") == null) { // Purpur
1919
Date buildDate = new java.text.SimpleDateFormat("yyyy-MM-dd HH:mm:ss Z").parse(Main.class.getPackage().getImplementationVendor()); // Paper
2020

‎patches/server/0033-Fix-stuck-in-portals.patch

+2-2
Original file line numberDiff line numberDiff line change
@@ -33,10 +33,10 @@ index 46def5d84bbb64242a8a7520eca57b0f0270d508..54e5832e7c73ada05ad3849cb5086798
3333
// CraftBukkit end
3434
this.setLevel(worldserver);
3535
diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
36-
index 8c9cd527f9d37e60cb53247efbd5e78398c69c53..5fc6bba4eb3fcb878d5b7ea659412e3c9f5ba4ce 100644
36+
index 8542a26068a0ddaed9f886e7d572c5b578c0e438..566d7da6056318329d8a0b9bbe26932c9e104a2f 100644
3737
--- a/src/main/java/net/minecraft/world/entity/Entity.java
3838
+++ b/src/main/java/net/minecraft/world/entity/Entity.java
39-
@@ -2858,12 +2858,15 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
39+
@@ -2867,12 +2867,15 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
4040
return Vec3.directionFromRotation(this.getRotationVector());
4141
}
4242

‎patches/server/0034-Entities-can-use-portals-configuration.patch

+3-3
Original file line numberDiff line numberDiff line change
@@ -21,10 +21,10 @@ index ebbf7b631309e80300f991426c50deef7f7a12aa..da2f7c5f083248206b476230c30e7049
2121
+ }
2222
}
2323
diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
24-
index 5fc6bba4eb3fcb878d5b7ea659412e3c9f5ba4ce..5f7843fa6480ac5ece2e7adb6b367271d393a5a0 100644
24+
index 566d7da6056318329d8a0b9bbe26932c9e104a2f..ca734489099e4730e42e45f90041c69de18ecb2c 100644
2525
--- a/src/main/java/net/minecraft/world/entity/Entity.java
2626
+++ b/src/main/java/net/minecraft/world/entity/Entity.java
27-
@@ -2863,7 +2863,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
27+
@@ -2872,7 +2872,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
2828
if (this.isOnPortalCooldown()) {
2929
if (!(me.minhh2792.pearl.PearlConfig.playerFixStuckInPortal && this instanceof Player && !pos.equals(portalPos))) // Purpur
3030
this.setPortalCooldown();
@@ -33,7 +33,7 @@ index 5fc6bba4eb3fcb878d5b7ea659412e3c9f5ba4ce..5f7843fa6480ac5ece2e7adb6b367271
3333
if (!this.level.isClientSide && !pos.equals(this.portalEntrancePos)) {
3434
this.portalEntrancePos = pos.immutable();
3535
portalPos = BlockPos.ZERO; // Purpur
36-
@@ -3529,7 +3529,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
36+
@@ -3537,7 +3537,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
3737
}
3838

3939
public boolean canChangeDimensions() {

‎patches/server/0035-Add-5-second-tps-average-in-tps.patch

+3-3
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ index fa56cd09102a89692b42f1d14257990508c5c720..f9251183df72ddc56662fd3f02acf216
2929
setListData(vector);
3030
}
3131
diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
32-
index db3b6cc3cc4e04287180201eaea98911dbc6b2ba..9d26ef90a0366865b88152826dfb25de94de371b 100644
32+
index 48433e1925245daa30e939749c928366efb3195f..5177fe20bef80a8d0c09c8ff0255112c56afb51d 100644
3333
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
3434
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
3535
@@ -287,7 +287,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@@ -71,10 +71,10 @@ index db3b6cc3cc4e04287180201eaea98911dbc6b2ba..9d26ef90a0366865b88152826dfb25de
7171
tickSection = curTime;
7272
}
7373
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
74-
index 7a7cc088bf2c6ca3d9990244c6c1f6cf0fc2fe6f..4db16457200a7e52f211aab83b86eadb4249bad4 100644
74+
index 5a37187090ba5216c487eda04b7fc26fa2a14dea..598be44733886ef676252258178fa8949e62e421 100644
7575
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
7676
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
77-
@@ -2676,6 +2676,7 @@ public final class CraftServer implements Server {
77+
@@ -2683,6 +2683,7 @@ public final class CraftServer implements Server {
7878
@Override
7979
public double[] getTPS() {
8080
return new double[] {

0 commit comments

Comments
 (0)