Mirrors/Purpur
1
0
Fork 1
mirror of https://github.com/PurpurMC/Purpur.git synced 2026-02-17 16:37:43 +01:00
Code Issues Packages Projects Releases Wiki Activity

rebase

Browse Source
This commit is contained in:
Ben Kerllenevich
2021-11-26 19:28:34 -05:00
parent 19b899b280
commit 9afd573ce5
24 changed files with 56 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
gradle.properties
View File

@@ -1,10 +1,10 @@
group = org.purpurmc.purpur
version = 1.18-pre8-R0.1-SNAPSHOT
version = 1.18-rc3-R0.1-SNAPSHOT
mcVersion = 1.18-pre8
mcVersion = 1.18-rc3
packageVersion = 1_18_R1
paperCommit = 4c2918206976b64b36e27285bd1035b49e12f44d
paperCommit = 6876364b77727f2b19cc2cd983c5207c51301e4d
org.gradle.caching = true
org.gradle.parallel = true

4
patches/api/0003-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 7de08c12aec311a8de631a8ec37147579c5e9963..90a1635379f3db8f6158099198d142e6c2cc1c8c 100644
index 5d928c5e82033dd812d406fce7353fd4824195c0..8189fe28d692608b78c7861f0202d2ba17587de9 100644
--- a/src/main/java/org/bukkit/entity/Player.java
+++ b/src/main/java/org/bukkit/entity/Player.java
@@ -2290,4 +2290,13 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
@@ -2298,4 +2298,13 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
@Override
Spigot spigot();
// Spigot end

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

@@ -81,10 +81,10 @@ index 0000000000000000000000000000000000000000..0c8b3e5e4ba412624357ea5662a78862
+ }
+}
diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
index 90a1635379f3db8f6158099198d142e6c2cc1c8c..dfc092c5f1f4e00d3eabb72b9f15d203cca602f7 100644
index 8189fe28d692608b78c7861f0202d2ba17587de9..252d848393525da36378148d9698cc05a39d8d11 100644
--- a/src/main/java/org/bukkit/entity/Player.java
+++ b/src/main/java/org/bukkit/entity/Player.java
@@ -2298,5 +2298,24 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
@@ -2306,5 +2306,24 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
* @return True if Player uses Purpur Client
*/
public boolean usesPurpurClient();

4
patches/api/0015-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 dfc092c5f1f4e00d3eabb72b9f15d203cca602f7..081713363eaee99b9332f05e8d7afc218a044754 100644
index 252d848393525da36378148d9698cc05a39d8d11..18eb516f3fbe29df9b4e81d3969d6c3fee799dd7 100644
--- a/src/main/java/org/bukkit/entity/Player.java
+++ b/src/main/java/org/bukkit/entity/Player.java
@@ -2317,5 +2317,26 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
@@ -2325,5 +2325,26 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
* Reset the idle timer back to 0
*/
void resetIdleTimer();

6
patches/api/0027-Fix-javadoc-warnings-missing-param-and-return.patch
View File

@@ -921,10 +921,10 @@ index a6a7429ed2e1eefb2b12b7480ed74fcc3963a864..e8027e1d505dda6effbb1698550016e8
NORMAL(false),
diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
index 081713363eaee99b9332f05e8d7afc218a044754..fb4d5be0a972a5a8d441a628d796d6ada86cfe79 100644
index 18eb516f3fbe29df9b4e81d3969d6c3fee799dd7..ef9a545f71a2a5ee37b188355d789705f928280e 100644
--- a/src/main/java/org/bukkit/entity/Player.java
+++ b/src/main/java/org/bukkit/entity/Player.java
@@ -2120,6 +2120,8 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
@@ -2128,6 +2128,8 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
void resetCooldown();
/**
@@ -933,7 +933,7 @@ index 081713363eaee99b9332f05e8d7afc218a044754..fb4d5be0a972a5a8d441a628d796d6ad
* @return the client option value of the player
*/
@NotNull
@@ -2151,6 +2153,9 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
@@ -2159,6 +2161,9 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
// Paper end
// Spigot start

4
patches/api/0035-Flying-Fall-Damage-API.patch
View File

@@ -5,10 +5,10 @@ Subject: [PATCH] Flying Fall Damage API
diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
index 2b2c36e950f1518c795208157f52211a2e93f467..d4f66b338ecfe8c1bdcd8f5763e61539923c7efc 100644
index 15243abfcbebb0219cabbf56a18910da2f1a027a..ada1063772875d02321cefead55a054efc4369c0 100644
--- a/src/main/java/org/bukkit/entity/Player.java
+++ b/src/main/java/org/bukkit/entity/Player.java
@@ -2343,5 +2343,19 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
@@ -2351,5 +2351,19 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
* @param invulnerableTicks Invulnerable ticks remaining
*/
void setSpawnInvulnerableTicks(int invulnerableTicks);

4
patches/server/0002-Rebrand.patch
View File

@@ -113,10 +113,10 @@ index e0b1f0671d16ddddcb6725acd25a1d1d69e42701..8c3c68465197fafc14849dc38a572e30
.completer(new ConsoleCommandCompleter(this.server))
.option(LineReader.Option.COMPLETE_IN_WORD, true);
diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
index 309e960ba7678e09d7eb7af11f57e5c3ff4f3d9e..0a98fddbccd2733bb4fbf6d429d934579566257e 100644
index 519806cee3a45eaaedefa83b7237b073c9bbc332..1f3f93485f8ceab2f8d2601a952414b993ace6a3 100644
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
@@ -1703,7 +1703,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@@ -1707,7 +1707,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@DontObfuscate
public String getServerModName() {

4
patches/server/0004-Purpur-client-support.patch
View File

@@ -43,10 +43,10 @@ index 3eba6962040f33b7b31b16c9de22d90f225710b4..23074f0b00cde60e3a42335c7aa3eb4f
try {
byte[] data = new byte[packet.data.readableBytes()];
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
index bc529afc8aff97b620209332aa2a4c8111075d62..653f038a76ac6a0674fbfbe193d38a15105224a2 100644
index 2ebeb2ab175cd93f7adc9f4ed923831e37481b8f..d6f92c60eb6f0507466c4d2941f3ef02fa58b1cc 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -2530,4 +2530,11 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -2538,4 +2538,11 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
return this.spigot;
}
// Spigot end

4
patches/server/0005-Component-related-conveniences.patch
View File

@@ -36,10 +36,10 @@ index c856b38b49969f6eb0b2a82bff6d80967857643d..ed8b90e90dc4878bce9eecbbf944f526
public void displayClientMessage(Component message, boolean actionBar) {
this.sendMessage(message, actionBar ? ChatType.GAME_INFO : ChatType.CHAT, Util.NIL_UUID);
diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
index f90eea21300746ef510e6dccc1eda9cca6ac5a64..0e647bb7b4efefe8a56d8b9c01f747feea700e96 100644
index 24111c47145b296c442982affdbfe045c52386e1..986db30e5f8313d57345e16a793a22b426e2ecfa 100644
--- a/src/main/java/net/minecraft/server/players/PlayerList.java
+++ b/src/main/java/net/minecraft/server/players/PlayerList.java
@@ -1372,6 +1372,62 @@ public abstract class PlayerList {
@@ -1373,6 +1373,62 @@ public abstract class PlayerList {
}
// CraftBukkit end

6
patches/server/0006-Ridables.patch
View File

@@ -22,10 +22,10 @@ index 14610e6144ec144ebbec6fb0945c67bb0ea86795..6833eb5dc7aa64bef1b3b38de5e282bd
super(x, y, z);
}
diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
index 0a98fddbccd2733bb4fbf6d429d934579566257e..da7a83973afe93bfeab947b412a2839a3146b0af 100644
index 1f3f93485f8ceab2f8d2601a952414b993ace6a3..592ad9d2f5f1651ccc88032b0c530ae6b1dab8af 100644
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
@@ -1581,6 +1581,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@@ -1585,6 +1585,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
ServerLevel worldserver = (ServerLevel) iterator.next();
worldserver.hasPhysicsEvent = org.bukkit.event.block.BlockPhysicsEvent.getHandlerList().getRegisteredListeners().length > 0; // Paper
worldserver.hasEntityMoveEvent = io.papermc.paper.event.entity.EntityMoveEvent.getHandlerList().getRegisteredListeners().length > 0; // Paper
@@ -34,7 +34,7 @@ index 0a98fddbccd2733bb4fbf6d429d934579566257e..da7a83973afe93bfeab947b412a2839a
this.profiler.push(() -> {
diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
index 1cf809480d9ad7dd24c697d79621106544d32146..338fa80f3fde1918b8ccf23c017d386719d7ead8 100644
index 53c3b1abc1acf0b847fa2e52b9941bd003971342..20321bf08e3c42c7f8f4879c38d60220505fad5a 100644
--- a/src/main/java/net/minecraft/server/level/ServerLevel.java
+++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
@@ -208,6 +208,7 @@ public class ServerLevel extends Level implements WorldGenLevel {

6
patches/server/0011-AFK-API.patch
View File

@@ -263,10 +263,10 @@ index 20215510857b8e49ea0c93d35eddfbad7cd355b0..996171e7271e62e72c0b2b213c21caf5
public boolean untamedTamablesAreRidable = true;
public boolean useNightVisionWhenRiding = false;
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
index 653f038a76ac6a0674fbfbe193d38a15105224a2..281cb1b19a2e05d18352f612a74097e4454ab2f6 100644
index d6f92c60eb6f0507466c4d2941f3ef02fa58b1cc..28b70bb4c0d15334a877840c7ec3fbb6967d5729 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -427,10 +427,15 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -428,10 +428,15 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@Override
public void setPlayerListName(String name) {
@@ -283,7 +283,7 @@ index 653f038a76ac6a0674fbfbe193d38a15105224a2..281cb1b19a2e05d18352f612a74097e4
for (ServerPlayer player : (List<ServerPlayer>) server.getHandle().players) {
if (player.getBukkitEntity().canSee(this)) {
player.connection.send(new ClientboundPlayerInfoPacket(ClientboundPlayerInfoPacket.Action.UPDATE_DISPLAY_NAME, this.getHandle()));
@@ -2536,5 +2541,20 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -2544,5 +2549,20 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
public boolean usesPurpurClient() {
return getHandle().purpurClient;
}

4
patches/server/0013-Configurable-server-mod-name.patch
View File

@@ -5,10 +5,10 @@ Subject: [PATCH] Configurable server mod name
diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
index da7a83973afe93bfeab947b412a2839a3146b0af..2ffc5d9c145cdf53baa8db260f03660a76db78c5 100644
index 592ad9d2f5f1651ccc88032b0c530ae6b1dab8af..b5a307f00f92a640b13c60f6ebee204223c0d9e2 100644
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
@@ -1704,7 +1704,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@@ -1708,7 +1708,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@DontObfuscate
public String getServerModName() {

4
patches/server/0015-Lagging-threshold.patch
View File

@@ -5,7 +5,7 @@ Subject: [PATCH] Lagging threshold
diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
index 2ffc5d9c145cdf53baa8db260f03660a76db78c5..e6c6fe80e2fddceec4cd16b08cf7aab888c7fd9d 100644
index b5a307f00f92a640b13c60f6ebee204223c0d9e2..0471827e17e93f3e579290a0100d3236d95fe7f1 100644
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
@@ -303,6 +303,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@@ -16,7 +16,7 @@ index 2ffc5d9c145cdf53baa8db260f03660a76db78c5..e6c6fe80e2fddceec4cd16b08cf7aab8
public final SlackActivityAccountant slackActivityAccountant = new SlackActivityAccountant();
// Spigot end
public static long currentTickLong = 0L; // Paper
@@ -1250,6 +1251,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@@ -1246,6 +1247,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
this.recentTps[1] = tps5.getAverage();
this.recentTps[2] = tps15.getAverage();
// Paper end

6
patches/server/0018-Player-invulnerabilities.patch
View File

@@ -108,7 +108,7 @@ index c1bbe2786b98649ae7882a05070f2bdad813d7b4..621f0f75096c89bd050f7e0ede8abcb1
this.cserver.getPluginManager().callEvent(new PlayerResourcePackStatusEvent(this.getCraftPlayer(), packStatus)); // CraftBukkit
// Paper end
diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
index 0e647bb7b4efefe8a56d8b9c01f747feea700e96..b9e13e523e5a43b256c49970ad1b3dca286fc03c 100644
index 986db30e5f8313d57345e16a793a22b426e2ecfa..1ef7d23da7057b3a1f8498201ab6a952ddc3788f 100644
--- a/src/main/java/net/minecraft/server/players/PlayerList.java
+++ b/src/main/java/net/minecraft/server/players/PlayerList.java
@@ -993,6 +993,8 @@ public abstract class PlayerList {
@@ -143,10 +143,10 @@ index 996171e7271e62e72c0b2b213c21caf53c815e97..8e9ba3a8582c8e5d1e14bf3bfa8ecfce
public boolean babiesAreRidable = true;
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
index 281cb1b19a2e05d18352f612a74097e4454ab2f6..b927f741695c783b5c3a782ea669c7d76333c2bd 100644
index 28b70bb4c0d15334a877840c7ec3fbb6967d5729..10affdc93c75b1b2e4e6966201bd9da353178573 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -2556,5 +2556,20 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -2564,5 +2564,20 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
public void resetIdleTimer() {
getHandle().resetLastActionTime();
}

4
patches/server/0052-Configurable-TPS-Catchup.patch
View File

@@ -5,10 +5,10 @@ Subject: [PATCH] Configurable TPS Catchup
diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
index e6c6fe80e2fddceec4cd16b08cf7aab888c7fd9d..a98785ec0e51a242ff29a0a5ae3a6bbbdf16d7c9 100644
index 0471827e17e93f3e579290a0100d3236d95fe7f1..fd32c276207100c1c52677a109764037e277316a 100644
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
@@ -1269,7 +1269,13 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@@ -1265,7 +1265,13 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
this.tickServer(this::haveTime);
this.profiler.popPush("nextTickWait");
this.mayHaveDelayedTasks = true;

6
patches/server/0066-Add-5-second-tps-average-in-tps.patch
View File

@@ -27,7 +27,7 @@ index fa56cd09102a89692b42f1d14257990508c5c720..f9251183df72ddc56662fd3f02acf216
setListData(vector);
}
diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
index a98785ec0e51a242ff29a0a5ae3a6bbbdf16d7c9..5c1d9e9af0efe1b83edf2c47574c67ae8d3c064e 100644
index fd32c276207100c1c52677a109764037e277316a..947f27ba75b3a139f6e493f24a10483f40f3a6b9 100644
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
@@ -302,7 +302,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@@ -39,7 +39,7 @@ index a98785ec0e51a242ff29a0a5ae3a6bbbdf16d7c9..5c1d9e9af0efe1b83edf2c47574c67ae
public boolean lagging = false; // Purpur
public final SlackActivityAccountant slackActivityAccountant = new SlackActivityAccountant();
// Spigot end
@@ -1153,6 +1153,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@@ -1149,6 +1149,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
private static final long MAX_CATCHUP_BUFFER = TICK_TIME * TPS * 60L;
private long lastTick = 0;
private long catchupTime = 0;
@@ -47,7 +47,7 @@ index a98785ec0e51a242ff29a0a5ae3a6bbbdf16d7c9..5c1d9e9af0efe1b83edf2c47574c67ae
public final RollingAverage tps1 = new RollingAverage(60);
public final RollingAverage tps5 = new RollingAverage(60 * 5);
public final RollingAverage tps15 = new RollingAverage(60 * 15);
@@ -1243,13 +1244,17 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@@ -1239,13 +1240,17 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
{
final long diff = curTime - tickSection;
java.math.BigDecimal currentTps = TPS_BASE.divide(new java.math.BigDecimal(diff), 30, java.math.RoundingMode.HALF_UP);

4
patches/server/0068-Item-entity-immunities.patch
View File

@@ -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 3947e1f2823e8d077350b7e781c04a4b46a83939..9656e8f0338568d317d81f0a54e3354652ec7353 100644
index 7c4154b1b5ccc53af5f5fb186c2a5d1ff88c7af1..29f9db14f1bc89b544635b0c4932e84ebc6805ab 100644
--- a/src/main/java/net/minecraft/server/level/ChunkMap.java
+++ b/src/main/java/net/minecraft/server/level/ChunkMap.java
@@ -2179,7 +2179,7 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
@@ -2246,7 +2246,7 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
public class TrackedEntity {

6
patches/server/0124-Spread-out-and-optimise-player-list-ticksSpread-out-.patch
View File

@@ -6,7 +6,7 @@ Subject: [PATCH] Spread out and optimise player list ticksSpread out and
diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
index 811629721c4e3babb5437031910185daf10d5784..122b6f4fd8334483d32dbe353c273dbec14086aa 100644
index 5902bfd6b5d2a9df6bd60b53ad8ba14719f5bf81..f50f884430781ddf58bb2db13bf3982c8ec0a817 100644
--- a/src/main/java/net/minecraft/server/players/PlayerList.java
+++ b/src/main/java/net/minecraft/server/players/PlayerList.java
@@ -1007,22 +1007,22 @@ public abstract class PlayerList {
@@ -46,10 +46,10 @@ index 811629721c4e3babb5437031910185daf10d5784..122b6f4fd8334483d32dbe353c273dbe
public void broadcastAll(Packet<?> packet) {
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
index b927f741695c783b5c3a782ea669c7d76333c2bd..2fc276e0fc43d21ce9dd590991b564c65f6b249b 100644
index 10affdc93c75b1b2e4e6966201bd9da353178573..5a0d709231ab7fffad60b8fba7f2f490535c8423 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -1526,7 +1526,13 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -1527,7 +1527,13 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@Override
public boolean canSee(Player player) {

6
patches/server/0129-Implement-TPSBar.patch
View File

@@ -17,10 +17,10 @@ index d054bee8c7c6f6bf608252f21b2f5192b59c086c..12f5e8b11fad04a1fec717b68fbbf80e
if (environment.includeIntegrated) {
diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
index 5c1d9e9af0efe1b83edf2c47574c67ae8d3c064e..e35b469133dc8bdac02e97f8d0792690e568e31c 100644
index 947f27ba75b3a139f6e493f24a10483f40f3a6b9..5846b246019e1a161c658240d772d635dffe45ef 100644
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
@@ -1127,6 +1127,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@@ -1123,6 +1123,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
this.safeShutdown(flag, false);
}
public void safeShutdown(boolean flag, boolean isRestarting) {
@@ -84,7 +84,7 @@ index e07095a3ed1af5a8bb7715c264535ae952e264d9..dd186ad2080d358ee1ed5c8ac6725a9e
// Purpur end
}
diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
index 122b6f4fd8334483d32dbe353c273dbec14086aa..e4e7049e9e9739b5f5035319640eb04642adcb05 100644
index f50f884430781ddf58bb2db13bf3982c8ec0a817..8fb52533367cab298c9a0b2ef2f4712308b5547b 100644
--- a/src/main/java/net/minecraft/server/players/PlayerList.java
+++ b/src/main/java/net/minecraft/server/players/PlayerList.java
@@ -482,6 +482,7 @@ public abstract class PlayerList {

4
patches/server/0136-Add-EntityTeleportHinderedEvent.patch
View File

@@ -113,10 +113,10 @@ index 1ba59900ddf403453aeb4f82b097feaab3dae3ff..30302c1cfdff65a5f1d0adde4c831f0a
}
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
index 2fc276e0fc43d21ce9dd590991b564c65f6b249b..b3e1e8d225282216df0fb88335415cdf9ffa781d 100644
index 5a0d709231ab7fffad60b8fba7f2f490535c8423..f223685ecb4e8dfb9b97a97ed106b052953be89f 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -965,6 +965,10 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -966,6 +966,10 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
}
if (entity.isVehicle()) {

4
patches/server/0196-Flying-Fall-Damage-API.patch
View File

@@ -26,10 +26,10 @@ index f55aef0116caf662f9cf1b14750422de802860bb..df780b1e7d0f598c5b5eb249f69f342a
} else {
if (fallDistance >= 2.0F) {
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
index b3e1e8d225282216df0fb88335415cdf9ffa781d..c260c5446235177ebf68f75eb09ed8dd68545208 100644
index f223685ecb4e8dfb9b97a97ed106b052953be89f..d43a8f5931a2b6868ed62acb1bfb513612a9faf9 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -2581,5 +2581,14 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -2589,5 +2589,14 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
public void setSpawnInvulnerableTicks(int spawnInvulnerableTime) {
getHandle().spawnInvulnerableTime = spawnInvulnerableTime;
}

4
patches/server/0230-Add-force-and-prompt-parameters-to-resource-pack-api.patch
View File

@@ -5,7 +5,7 @@ Subject: [PATCH] Add force and prompt parameters to resource pack api
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
index c260c5446235177ebf68f75eb09ed8dd68545208..704b03d217c4324b191f2f216b7e045af3b93f63 100644
index d43a8f5931a2b6868ed62acb1bfb513612a9faf9..416b1b590f10284ad14d3f1bade23fc28e0643d9 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -27,6 +27,8 @@ import java.util.WeakHashMap;
@@ -17,7 +17,7 @@ index c260c5446235177ebf68f75eb09ed8dd68545208..704b03d217c4324b191f2f216b7e045a
import net.minecraft.Util;
import net.minecraft.advancements.AdvancementProgress;
import net.minecraft.core.BlockPos;
@@ -1707,11 +1709,23 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -1708,11 +1710,23 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@Override
public void setResourcePack(String url, byte[] hash) {

4
patches/server/0232-Extended-OfflinePlayer-API.patch
View File

@@ -223,10 +223,10 @@ index 88bc0807e8bf66a65422f85f1112336334eb3de2..d0e822b329085b9d0a42276c3cacd6cb
+ // Purpur end - OfflinePlayer API
}
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
index 704b03d217c4324b191f2f216b7e045af3b93f63..1d05ea7c29b95313b28965848182fc00745f265d 100644
index 416b1b590f10284ad14d3f1bade23fc28e0643d9..f52f6432438b9295e73ca3c99a6a20ea01a7f1b3 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -1882,6 +1882,28 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -1883,6 +1883,28 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
return this.getHandle().getAbilities().walkingSpeed * 2f;
}

4
patches/server/0242-UPnP-Port-Forwarding.patch
View File

@@ -5,7 +5,7 @@ Subject: [PATCH] UPnP Port Forwarding
diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
index cfb6a133d8edda91d97eeba0ce911c58d1ac5753..9136843cf13479d3e92922edaa6fc695381a7f2a 100644
index 8f61044b7837ec433763746980b55b739ae4db8d..9619ea9005204d6b81d1622601e39477f0493def 100644
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
@@ -308,6 +308,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@@ -16,7 +16,7 @@ index cfb6a133d8edda91d97eeba0ce911c58d1ac5753..9136843cf13479d3e92922edaa6fc695
public volatile Thread shutdownThread; // Paper
public volatile boolean abnormalExit = false; // Paper
@@ -1037,6 +1038,14 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@@ -1032,6 +1033,14 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
// CraftBukkit end
MinecraftServer.LOGGER.info("Stopping server");
MinecraftTimings.stopServer(); // Paper