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

Updated Upstream (Paper & Tuinity)

Browse Source 
Upstream has released updates that appear to apply and compile correctly

Paper Changes:
8fa15382b [Auto] Updated Upstream (CraftBukkit)
732b2f6b5 [CI-SKIP] [Auto] Rebuild Patches
c5a39ffa2 Add BlockPreDispenseEvent (#5075)
8aeb4c9c3 Correctly skip pathfinder ticks for inactive entities (#5085)
0e420049c Fix console spam when removing chests in water
56b7935bb Add PlayerChangeBeaconEffectEvent
2eda45c34 added Wither API
97d0c571b Added Vanilla Entity Tags
fccac282a fix NPE in getDisplayNameComponent
24e140372 Configurable max leash distance

Tuinity Changes:
d3ee22224 Merge dev/lighting
This commit is contained in:
BillyGalbreath
2021-01-20 23:52:09 -06:00
parent cd18335858
commit 643d9681ff
39 changed files with 614 additions and 372 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Paper

Submodule Paper updated: d6f730655a...8fa15382bd

758
patches/server/0001-Tuinity-Server-Changes.patch
View File

File diff suppressed because it is too large Load Diff

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

@@ -182,7 +182,7 @@ index 0000000000000000000000000000000000000000..d8b408f061d96e2fa8e2e587462e2221
+ }
+}
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index a383ba5e897101a3da1544c877148b43be7a6319..92bfae8f8249e70105fd848f01f950b67bb1d97e 100644
index bd7bccbea1a0a052ef7bd6ab299ae72336874911..5100460bab83cd75ac8dcdcc50ea663b1c486d00 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -232,7 +232,7 @@ import javax.annotation.Nullable; // Paper
@@ -195,10 +195,10 @@ index a383ba5e897101a3da1544c877148b43be7a6319..92bfae8f8249e70105fd848f01f950b6
private final String bukkitVersion = Versioning.getBukkitVersion();
private final Logger logger = Logger.getLogger("Minecraft");
diff --git a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
index 979f3504e6a6ca46993f3d9b0f408ab6744bdccd..568d2d78f5961098dfb8947d45ca26fd9334f151 100644
index ac5003dc827217bd1947c71044abcbcbd2210dcd..37c561fb775cf7dd955b185b4ea94fecc574be63 100644
--- a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
+++ b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
@@ -353,7 +353,7 @@ public final class CraftMagicNumbers implements UnsafeValues {
@@ -370,7 +370,7 @@ public final class CraftMagicNumbers implements UnsafeValues {
@Override
public com.destroystokyo.paper.util.VersionFetcher getVersionFetcher() {

4
patches/server/0003-Purpur-config-files.patch
View File

@@ -373,7 +373,7 @@ index 0000000000000000000000000000000000000000..4904be939c7a4b1d1583fd7b6232c930
+ }
+}
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index 92bfae8f8249e70105fd848f01f950b67bb1d97e..7502726207073bdac6fc4166064575696f6a7270 100644
index 5100460bab83cd75ac8dcdcc50ea663b1c486d00..b5d274c1fe214ea274057084bc40d6eeb618b21d 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -862,6 +862,7 @@ public final class CraftServer implements Server {
@@ -400,7 +400,7 @@ index 92bfae8f8249e70105fd848f01f950b67bb1d97e..7502726207073bdac6fc416606457569
overrideAllCommandBlockCommands = commandsConfiguration.getStringList("command-block-overrides").contains("*");
ignoreVanillaPermissions = commandsConfiguration.getBoolean("ignore-vanilla-permissions");
@@ -2293,6 +2296,18 @@ public final class CraftServer implements Server {
@@ -2298,6 +2301,18 @@ public final class CraftServer implements Server {
}
// Tuinity end - add config to timings report

10
patches/server/0009-AFK-API.patch
View File

@@ -149,7 +149,7 @@ index b5e1a860a2569d7668330827614d221b60f3fc78..5f85a1d513f4fdc21b64e1a2b6882e33
// Paper start
public static final Predicate<Entity> affectsSpawning = (entity) -> {
diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
index 5c708ed2cd3b10744b0d6d2eb2ef51d0411ce0dc..d1d4f4baf33e6b2224116f22a63b6d218e26635b 100644
index 4058c1f7ada7d0c9e4ba73a0073b4f94bf410a8f..caf9ce94a7cb6154981d42953c81b588b19e3814 100644
--- a/src/main/java/net/minecraft/server/PlayerConnection.java
+++ b/src/main/java/net/minecraft/server/PlayerConnection.java
@@ -250,6 +250,12 @@ public class PlayerConnection implements PacketListenerPlayIn {
@@ -165,7 +165,7 @@ index 5c708ed2cd3b10744b0d6d2eb2ef51d0411ce0dc..d1d4f4baf33e6b2224116f22a63b6d21
this.player.resetIdleTimer(); // CraftBukkit - SPIGOT-854
this.disconnect(new ChatMessage("multiplayer.disconnect.idling"));
}
@@ -506,6 +512,8 @@ public class PlayerConnection implements PacketListenerPlayIn {
@@ -517,6 +523,8 @@ public class PlayerConnection implements PacketListenerPlayIn {
this.lastYaw = to.getYaw();
this.lastPitch = to.getPitch();
@@ -174,16 +174,16 @@ index 5c708ed2cd3b10744b0d6d2eb2ef51d0411ce0dc..d1d4f4baf33e6b2224116f22a63b6d21
// Skip the first time we do this
if (true) { // Spigot - don't skip any move events
Location oldTo = to.clone();
@@ -1217,7 +1225,7 @@ public class PlayerConnection implements PacketListenerPlayIn {
@@ -1228,7 +1236,7 @@ public class PlayerConnection implements PacketListenerPlayIn {
if (!this.player.H() && d11 > org.spigotmc.SpigotConfig.movedWronglyThreshold && !this.player.isSleeping() && !this.player.playerInteractManager.isCreative() && this.player.playerInteractManager.getGameMode() != EnumGamemode.SPECTATOR) { // Spigot
flag1 = true;
flag1 = true; // Tuinity - diff on change, this should be moved wrongly
- PlayerConnection.LOGGER.warn("{} moved wrongly!", this.player.getDisplayName().getString());
+ PlayerConnection.LOGGER.warn("{} moved wrongly! ({})", this.player.getDisplayName().getString(), d11); // Purpur
}
this.player.setLocation(d4, d5, d6, f, f1);
@@ -1256,6 +1264,8 @@ public class PlayerConnection implements PacketListenerPlayIn {
@@ -1278,6 +1286,8 @@ public class PlayerConnection implements PacketListenerPlayIn {
this.lastYaw = to.getYaw();
this.lastPitch = to.getPitch();

4
patches/server/0010-Bring-back-server-name.patch
View File

@@ -17,10 +17,10 @@ index 65961a03728852bd75367083a0de6fd0082b17cb..780474397acb4d0e7ecb4540e1a2db57
public final boolean spawnNpcs = this.getBoolean("spawn-npcs", true);
public final boolean pvp = this.getBoolean("pvp", true);
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index 7502726207073bdac6fc4166064575696f6a7270..c2ac3c69e75de35e38aa262f0634f58005fd3daf 100644
index b5d274c1fe214ea274057084bc40d6eeb618b21d..43ee4f6ba778ceb0b34906ace86f0f12587a8e8d 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -2445,4 +2445,11 @@ public final class CraftServer implements Server {
@@ -2450,4 +2450,11 @@ public final class CraftServer implements Server {
return mobGoals;
}
// Paper end

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

@@ -41,10 +41,10 @@ index 4627261562a1482aecf4034b8717ecccc2dd9eb0..a34ed978596f1a466b0b48e7db92ac4f
public static boolean enderChestSixRows = false;
public static boolean enderChestPermissionRows = false;
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index c2ac3c69e75de35e38aa262f0634f58005fd3daf..d61f103c1909a82615e49f63b0bdf92e718764ac 100644
index 43ee4f6ba778ceb0b34906ace86f0f12587a8e8d..2ddf0e5589b6f45f502e6f675000fec361b186fe 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -2451,5 +2451,10 @@ public final class CraftServer implements Server {
@@ -2456,5 +2456,10 @@ public final class CraftServer implements Server {
public String getServerName() {
return getProperties().serverName;
}

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

@@ -67,10 +67,10 @@ index dc69cba40806782e0b8ffd3b77aa6298feddb35d..ca63c583524c760072933602079ffe34
public Scoreboard getScoreboard() {
return getBukkitEntity().getScoreboard().getHandle();
diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
index d1d4f4baf33e6b2224116f22a63b6d218e26635b..07fcf1646a46b867ffb0e88746b4a781ef55729b 100644
index caf9ce94a7cb6154981d42953c81b588b19e3814..e833447073585ff97f8ab3a95caea8866fcc24e2 100644
--- a/src/main/java/net/minecraft/server/PlayerConnection.java
+++ b/src/main/java/net/minecraft/server/PlayerConnection.java
@@ -1666,6 +1666,7 @@ public class PlayerConnection implements PacketListenerPlayIn {
@@ -1708,6 +1708,7 @@ public class PlayerConnection implements PacketListenerPlayIn {
PlayerConnectionUtils.ensureMainThread(packetplayinresourcepackstatus, this, this.player.getWorldServer());
// Paper start
PlayerResourcePackStatusEvent.Status packStatus = PlayerResourcePackStatusEvent.Status.values()[packetplayinresourcepackstatus.status.ordinal()];

4
patches/server/0021-Alternative-Keepalive-Handling.patch
View File

@@ -17,7 +17,7 @@ index 8e93f1540ba5f995489c1fbcec70d10b011cd9c3..470f92c4fb0919d052b19acff8dff533
return this.a;
}
diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
index 07fcf1646a46b867ffb0e88746b4a781ef55729b..d74986818af4fbefdd60f865d2225d61008df7d1 100644
index e833447073585ff97f8ab3a95caea8866fcc24e2..fdd517290a0b306dff9c0fffadc424b59b8504f3 100644
--- a/src/main/java/net/minecraft/server/PlayerConnection.java
+++ b/src/main/java/net/minecraft/server/PlayerConnection.java
@@ -84,6 +84,7 @@ public class PlayerConnection implements PacketListenerPlayIn {
@@ -50,7 +50,7 @@ index 07fcf1646a46b867ffb0e88746b4a781ef55729b..d74986818af4fbefdd60f865d2225d61
if (this.isPendingPing()) {
if (!this.processedDisconnect && elapsedTime >= KEEPALIVE_LIMIT) { // check keepalive limit, don't fire if already disconnected
PlayerConnection.LOGGER.warn("{} was kicked due to keepalive timeout!", this.player.getName()); // more info
@@ -2840,6 +2856,16 @@ public class PlayerConnection implements PacketListenerPlayIn {
@@ -2882,6 +2898,16 @@ public class PlayerConnection implements PacketListenerPlayIn {
@Override
public void a(PacketPlayInKeepAlive packetplayinkeepalive) {

2
patches/server/0027-Giants-AI-settings.patch
View File

@@ -5,7 +5,7 @@ Subject: [PATCH] Giants AI settings
diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
index f292e15746a947c580aa93e0a23dbc032eccb561..0e465a2107bd27e59a437c48672068a951ccccff 100644
index 013c44f80f74376e8bbb37afb5de07aa5d8fb1bc..39036105b51dddbce8e4986e3be226f31fb13051 100644
--- a/src/main/java/net/minecraft/server/Entity.java
+++ b/src/main/java/net/minecraft/server/Entity.java
@@ -136,7 +136,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke

2
patches/server/0039-Cat-spawning-options.patch
View File

@@ -62,7 +62,7 @@ index 5e17868a76ea8e3f105c11d496d6da12afa0da41..5a0f8779672a9e34f6970045361630ab
}
diff --git a/src/main/java/net/minecraft/server/VillagePlace.java b/src/main/java/net/minecraft/server/VillagePlace.java
index 731a7b52c1c659b3b985704dea9cf57f6c5bcecb..fd32be3362ef88d903fd49ff8fa90c1bb762d9ec 100644
index fce9967912628c232fe41ccc17fe2296f001ec61..44063d599e39e087b3eccfe204ef2fd79c3364e5 100644
--- a/src/main/java/net/minecraft/server/VillagePlace.java
+++ b/src/main/java/net/minecraft/server/VillagePlace.java
@@ -178,6 +178,7 @@ public class VillagePlace extends RegionFileSection<VillagePlaceSection> {

4
patches/server/0041-Cows-eat-mushrooms.patch
View File

@@ -5,10 +5,10 @@ Subject: [PATCH] Cows eat mushrooms
diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
index 0e465a2107bd27e59a437c48672068a951ccccff..911a942d191659bdd055b2f1374246a829111330 100644
index 39036105b51dddbce8e4986e3be226f31fb13051..4ed4f31c8e34279f9aa9fd7bbddbb36239ea36ef 100644
--- a/src/main/java/net/minecraft/server/Entity.java
+++ b/src/main/java/net/minecraft/server/Entity.java
@@ -2787,6 +2787,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -2778,6 +2778,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
this.invulnerable = flag;
}

4
patches/server/0048-Signs-allow-color-codes.patch
View File

@@ -17,10 +17,10 @@ index ca63c583524c760072933602079ffe34796ff83c..eddec84023a3458deebec28215aba9ac
this.playerConnection.sendPacket(new PacketPlayOutOpenSignEditor(tileentitysign.getPosition()));
}
diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
index d74986818af4fbefdd60f865d2225d61008df7d1..1f2e8c6dbeaefaf7a4bba85d8302f444c4275e11 100644
index fdd517290a0b306dff9c0fffadc424b59b8504f3..3fca11948fad36b6adec55883d365e58a17925fa 100644
--- a/src/main/java/net/minecraft/server/PlayerConnection.java
+++ b/src/main/java/net/minecraft/server/PlayerConnection.java
@@ -2837,6 +2837,14 @@ public class PlayerConnection implements PacketListenerPlayIn {
@@ -2879,6 +2879,14 @@ public class PlayerConnection implements PacketListenerPlayIn {
}
}
// Paper end

4
patches/server/0055-Fix-the-dead-lagging-the-server.patch
View File

@@ -5,10 +5,10 @@ Subject: [PATCH] Fix the dead lagging the server
diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
index 911a942d191659bdd055b2f1374246a829111330..7f27993ee71b8ad081e0bb8d5e7f7e467683717e 100644
index 4ed4f31c8e34279f9aa9fd7bbddbb36239ea36ef..f18941c7c740959181b728ab9da06c7e9d97aa79 100644
--- a/src/main/java/net/minecraft/server/Entity.java
+++ b/src/main/java/net/minecraft/server/Entity.java
@@ -1532,6 +1532,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -1523,6 +1523,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
this.pitch = MathHelper.a(f1, -90.0F, 90.0F) % 360.0F;
this.lastYaw = this.yaw;
this.lastPitch = this.pitch;

2
patches/server/0070-Add-canSaveToDisk-to-Entity.patch
View File

@@ -17,7 +17,7 @@ index 076d6c1e1cc049dd312ecb30518e7b25fc2d7371..5f04591193d58ba7897194142da5efcb
final int saveLimit = worldserver.paperConfig.entityPerChunkSaveLimits.getOrDefault(entityType, -1);
if (saveLimit > -1) {
diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
index 7f27993ee71b8ad081e0bb8d5e7f7e467683717e..c164891ab4ee38244759309cee9d4aaf38f4f481 100644
index f18941c7c740959181b728ab9da06c7e9d97aa79..dfbb5a9538780cbd2a5766486138f35b189da235 100644
--- a/src/main/java/net/minecraft/server/Entity.java
+++ b/src/main/java/net/minecraft/server/Entity.java
@@ -308,6 +308,12 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke

2
patches/server/0071-Configurable-void-damage-height.patch
View File

@@ -5,7 +5,7 @@ Subject: [PATCH] Configurable void damage height
diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
index c164891ab4ee38244759309cee9d4aaf38f4f481..8ae0e83179026d09f318ffaae751c942ecd48c41 100644
index dfbb5a9538780cbd2a5766486138f35b189da235..9eb2e73c084b142bf04f798b572e6ca87f4f8416 100644
--- a/src/main/java/net/minecraft/server/Entity.java
+++ b/src/main/java/net/minecraft/server/Entity.java
@@ -611,7 +611,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke

4
patches/server/0076-Add-5-second-tps-average-in-tps.patch
View File

@@ -47,10 +47,10 @@ index 942f556eca32ce13c6b3490ef0d6f9e960a36d06..e16f120544ad46995dcf695849d3634c
lagging = recentTps[0] < net.pl3x.purpur.PurpurConfig.laggingThreshold; // Purpur
tickSection = curTime;
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index d61f103c1909a82615e49f63b0bdf92e718764ac..b3bc2d908a028fe182f4be2ed4d2bb6a1e9ec5cb 100644
index 2ddf0e5589b6f45f502e6f675000fec361b186fe..413c55feb6b1c2ddc80aa8dc1c83ed13b2c4c4a5 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -2243,6 +2243,7 @@ public final class CraftServer implements Server {
@@ -2248,6 +2248,7 @@ public final class CraftServer implements Server {
@Override
public double[] getTPS() {
return new double[] {

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

@@ -5,10 +5,10 @@ Subject: [PATCH] Item entity immunities
diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
index 8ae0e83179026d09f318ffaae751c942ecd48c41..dbf6e99ec49841336c81eadfd193216583b03a3b 100644
index 9eb2e73c084b142bf04f798b572e6ca87f4f8416..f5159b76dee6127d7db2addfcb512b5b1f5b9c41 100644
--- a/src/main/java/net/minecraft/server/Entity.java
+++ b/src/main/java/net/minecraft/server/Entity.java
@@ -1481,6 +1481,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -1472,6 +1472,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
}

4
patches/server/0081-Phantoms-attracted-to-crystals-and-crystals-shoot-ph.patch
View File

@@ -17,10 +17,10 @@ index 6fe5678cffc2487fe00c953d772f764bb37a4b11..bd0267ee4b3782f6d1ec39cba7966ba4
return (new EntityDamageSourceIndirect("indirectMagic", entity, entity1)).setIgnoreArmor().setMagic();
}
diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
index dbf6e99ec49841336c81eadfd193216583b03a3b..cf13b30c71e093296ffa02c6f1383de405ee34d3 100644
index f5159b76dee6127d7db2addfcb512b5b1f5b9c41..905e3a98fe900c82053b1514122bfe6cf1000dfa 100644
--- a/src/main/java/net/minecraft/server/Entity.java
+++ b/src/main/java/net/minecraft/server/Entity.java
@@ -2147,8 +2147,8 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -2138,8 +2138,8 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
return this.a(new ItemStack(imaterial), (float) i);
}

8
patches/server/0086-Allow-color-codes-in-books.patch
View File

@@ -5,10 +5,10 @@ Subject: [PATCH] Allow color codes in books
diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
index 1f2e8c6dbeaefaf7a4bba85d8302f444c4275e11..9b05adc3a834ce1f063c3b00505faed5e4ff66ba 100644
index 3fca11948fad36b6adec55883d365e58a17925fa..ffccdc3bf1d28836f4fc2772ebfde843415ea232 100644
--- a/src/main/java/net/minecraft/server/PlayerConnection.java
+++ b/src/main/java/net/minecraft/server/PlayerConnection.java
@@ -1018,7 +1018,8 @@ public class PlayerConnection implements PacketListenerPlayIn {
@@ -1029,7 +1029,8 @@ public class PlayerConnection implements PacketListenerPlayIn {
if (itemstack.getItem() == Items.WRITABLE_BOOK) {
NBTTagList nbttaglist = new NBTTagList();
@@ -18,7 +18,7 @@ index 1f2e8c6dbeaefaf7a4bba85d8302f444c4275e11..9b05adc3a834ce1f063c3b00505faed5
ItemStack old = itemstack.cloneItemStack(); // CraftBukkit
itemstack.a("pages", (NBTBase) nbttaglist);
CraftEventFactory.handleEditBookEvent(player, i, old, itemstack); // CraftBukkit
@@ -1036,13 +1037,14 @@ public class PlayerConnection implements PacketListenerPlayIn {
@@ -1047,13 +1048,14 @@ public class PlayerConnection implements PacketListenerPlayIn {
itemstack1.setTag(nbttagcompound.clone());
}
@@ -35,7 +35,7 @@ index 1f2e8c6dbeaefaf7a4bba85d8302f444c4275e11..9b05adc3a834ce1f063c3b00505faed5
ChatComponentText chatcomponenttext = new ChatComponentText(s1);
String s2 = IChatBaseComponent.ChatSerializer.a((IChatBaseComponent) chatcomponenttext);
@@ -1054,6 +1056,16 @@ public class PlayerConnection implements PacketListenerPlayIn {
@@ -1065,6 +1067,16 @@ public class PlayerConnection implements PacketListenerPlayIn {
}
}

4
patches/server/0087-Entity-lifespan.patch
View File

@@ -92,10 +92,10 @@ index c9791be9385c83c8ab626ff3661b0c6cb45822ad..c2144f78c24f015775a00b1c82de645e
}
diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
index 9b05adc3a834ce1f063c3b00505faed5e4ff66ba..5db09c913d7a0c6feef4e3fa22b22235238721cb 100644
index ffccdc3bf1d28836f4fc2772ebfde843415ea232..8932f4854d9fc52fb2ec66a748e640dfd8806461 100644
--- a/src/main/java/net/minecraft/server/PlayerConnection.java
+++ b/src/main/java/net/minecraft/server/PlayerConnection.java
@@ -2229,6 +2229,7 @@ public class PlayerConnection implements PacketListenerPlayIn {
@@ -2271,6 +2271,7 @@ public class PlayerConnection implements PacketListenerPlayIn {
boolean triggerLeashUpdate = itemInHand != null && itemInHand.getItem() == Items.LEAD && entity instanceof EntityInsentient;
Item origItem = this.player.inventory.getItemInHand() == null ? null : this.player.inventory.getItemInHand().getItem();
PlayerInteractEntityEvent event;

6
patches/server/0097-Duplicate-paper-s-vanilla-scoreboard-colors-patch-to.patch
View File

@@ -6,10 +6,10 @@ Subject: [PATCH] Duplicate paper's vanilla scoreboard colors patch to sync
diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
index 5db09c913d7a0c6feef4e3fa22b22235238721cb..e2f97fa2b350c56c7086d89b4f66d07f3668e479 100644
index 8932f4854d9fc52fb2ec66a748e640dfd8806461..eff58bba46e5cb4bd412fcb65e293d5b9eb58aba 100644
--- a/src/main/java/net/minecraft/server/PlayerConnection.java
+++ b/src/main/java/net/minecraft/server/PlayerConnection.java
@@ -1988,7 +1988,15 @@ public class PlayerConnection implements PacketListenerPlayIn {
@@ -2030,7 +2030,15 @@ public class PlayerConnection implements PacketListenerPlayIn {
return null;
}
@@ -26,7 +26,7 @@ index 5db09c913d7a0c6feef4e3fa22b22235238721cb..e2f97fa2b350c56c7086d89b4f66d07f
PlayerConnection.this.minecraftServer.console.sendMessage(message);
if (((LazyPlayerSet) queueEvent.getRecipients()).isLazy()) {
for (Object player : PlayerConnection.this.minecraftServer.getPlayerList().players) {
@@ -2021,7 +2029,7 @@ public class PlayerConnection implements PacketListenerPlayIn {
@@ -2063,7 +2071,7 @@ public class PlayerConnection implements PacketListenerPlayIn {
// Paper Start - (Meh) Support for vanilla world scoreboard name coloring
String displayName = event.getPlayer().getDisplayName();
if (this.player.getWorld().paperConfig.useVanillaScoreboardColoring) {

4
patches/server/0107-Stop-squids-floating-on-top-of-water.patch
View File

@@ -5,10 +5,10 @@ Subject: [PATCH] Stop squids floating on top of water
diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
index cf13b30c71e093296ffa02c6f1383de405ee34d3..3002dbaba08a5567e7e173f47f5973a8d6b4075a 100644
index 905e3a98fe900c82053b1514122bfe6cf1000dfa..e59826b3e822a49378ae0d7b7cbca8c5d5ff476d 100644
--- a/src/main/java/net/minecraft/server/Entity.java
+++ b/src/main/java/net/minecraft/server/Entity.java
@@ -3457,8 +3457,13 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -3448,8 +3448,13 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
this.lastYaw = this.yaw;
}

58
patches/server/0108-Ridables.patch
View File

@@ -161,7 +161,7 @@ index bd0267ee4b3782f6d1ec39cba7966ba4f62f1adf..8b36ac2b0950a827763aa2357700f37e
this.B = true;
return this;
diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
index 3002dbaba08a5567e7e173f47f5973a8d6b4075a..2bd65dd4c4c4824a7969392f8ded35cbb1f8a0b4 100644
index e59826b3e822a49378ae0d7b7cbca8c5d5ff476d..0115e2c73eff9d5e4c6778e32fc54b9c116b6b22 100644
--- a/src/main/java/net/minecraft/server/Entity.java
+++ b/src/main/java/net/minecraft/server/Entity.java
@@ -80,7 +80,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -200,7 +200,7 @@ index 3002dbaba08a5567e7e173f47f5973a8d6b4075a..2bd65dd4c4c4824a7969392f8ded35cb
private float headHeight;
// CraftBukkit start
public boolean persist = true;
@@ -1491,6 +1491,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -1482,6 +1482,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
return !this.justCreated && this.M.getDouble(TagsFluid.LAVA) > 0.0D;
}
@@ -208,7 +208,7 @@ index 3002dbaba08a5567e7e173f47f5973a8d6b4075a..2bd65dd4c4c4824a7969392f8ded35cb
public void a(float f, Vec3D vec3d) {
Vec3D vec3d1 = a(vec3d, f, this.yaw);
@@ -2247,6 +2248,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -2238,6 +2239,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
return this.a(entity, false);
}
@@ -216,7 +216,7 @@ index 3002dbaba08a5567e7e173f47f5973a8d6b4075a..2bd65dd4c4c4824a7969392f8ded35cb
public boolean a(Entity entity, boolean flag) {
for (Entity entity1 = entity; entity1.vehicle != null; entity1 = entity1.vehicle) {
if (entity1.vehicle == this) {
@@ -2342,6 +2344,13 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -2333,6 +2335,13 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
this.passengers.add(entity);
}
@@ -230,7 +230,7 @@ index 3002dbaba08a5567e7e173f47f5973a8d6b4075a..2bd65dd4c4c4824a7969392f8ded35cb
}
return true; // CraftBukkit
}
@@ -2382,6 +2391,12 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -2373,6 +2382,12 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
return false;
}
// Spigot end
@@ -243,7 +243,7 @@ index 3002dbaba08a5567e7e173f47f5973a8d6b4075a..2bd65dd4c4c4824a7969392f8ded35cb
this.passengers.remove(entity);
entity.j = 60;
}
@@ -2547,6 +2562,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -2538,6 +2553,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
this.setFlag(4, flag);
}
@@ -251,7 +251,7 @@ index 3002dbaba08a5567e7e173f47f5973a8d6b4075a..2bd65dd4c4c4824a7969392f8ded35cb
public boolean bE() {
return this.glowing || this.world.isClientSide && this.getFlag(6);
}
@@ -2769,6 +2785,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -2760,6 +2776,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
public void setHeadRotation(float f) {}
@@ -259,7 +259,7 @@ index 3002dbaba08a5567e7e173f47f5973a8d6b4075a..2bd65dd4c4c4824a7969392f8ded35cb
public void n(float f) {}
public boolean bL() {
@@ -3210,6 +3227,18 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -3201,6 +3218,18 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
return false;
}
@@ -278,7 +278,7 @@ index 3002dbaba08a5567e7e173f47f5973a8d6b4075a..2bd65dd4c4c4824a7969392f8ded35cb
@Override
public void sendMessage(IChatBaseComponent ichatbasecomponent, UUID uuid) {}
@@ -3662,4 +3691,47 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -3653,4 +3682,47 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
return ((ChunkProviderServer) world.getChunkProvider()).isInEntityTickingChunk(this);
}
// Paper end
@@ -614,7 +614,7 @@ index 74082136b38491a0a50d152c455edfa61a6afb9f..dcfad16e06450068d5801fc002c96501
if (this.c <= 0) {
this.c = 100;
diff --git a/src/main/java/net/minecraft/server/EntityCat.java b/src/main/java/net/minecraft/server/EntityCat.java
index 57166a543a9af9e10e38c983487fac7ea9d42d52..05929d5c539a738e6b6e8d32d9b0f843a665f4f6 100644
index 35f511c398795a0edeb5fe6d802f2a2bf754bf3a..700314b02abb355e6a600d744887a705cbcfb4e4 100644
--- a/src/main/java/net/minecraft/server/EntityCat.java
+++ b/src/main/java/net/minecraft/server/EntityCat.java
@@ -41,6 +41,25 @@ public class EntityCat extends EntityTameableAnimal {
@@ -4486,7 +4486,7 @@ index ca3c5150bcfe2a92b49ad5a27c23dd37a7054fbb..323d79a99402b0f6952b4fb873170069
this.targetSelector.a(2, this.br);
this.targetSelector.a(3, this.bs);
diff --git a/src/main/java/net/minecraft/server/EntityWither.java b/src/main/java/net/minecraft/server/EntityWither.java
index 53482a420c356fd50e5ab6dd729a271d6594dac7..f68cf834aa65cc4bbb1eb9901586395d41770955 100644
index 2e623ef9be036ea467e9e41817c2eced018f8f93..0442b722e5dc7ccc6e607fb3fa7766496b3398d5 100644
--- a/src/main/java/net/minecraft/server/EntityWither.java
+++ b/src/main/java/net/minecraft/server/EntityWither.java
@@ -32,6 +32,7 @@ public class EntityWither extends EntityMonster implements IRangedEntity {
@@ -4494,10 +4494,10 @@ index 53482a420c356fd50e5ab6dd729a271d6594dac7..f68cf834aa65cc4bbb1eb9901586395d
};
private static final PathfinderTargetCondition bz = (new PathfinderTargetCondition()).a(20.0D).a(EntityWither.by);
+ private int shootCooldown = 0; // Purpur
// Paper start
private boolean canPortal = false;
public EntityWither(EntityTypes<? extends EntityWither> entitytypes, World world) {
super(entitytypes, world);
@@ -39,15 +40,122 @@ public class EntityWither extends EntityMonster implements IRangedEntity {
@@ -44,15 +45,122 @@ public class EntityWither extends EntityMonster implements IRangedEntity {
this.setHealth(this.getMaxHealth());
this.getNavigation().d(true);
this.f = 50;
@@ -4621,7 +4621,7 @@ index 53482a420c356fd50e5ab6dd729a271d6594dac7..f68cf834aa65cc4bbb1eb9901586395d
this.targetSelector.a(1, new PathfinderGoalHurtByTarget(this, new Class[0]));
this.targetSelector.a(2, new PathfinderGoalNearestAttackableTarget<>(this, EntityInsentient.class, 0, false, false, EntityWither.by));
}
@@ -189,6 +297,16 @@ public class EntityWither extends EntityMonster implements IRangedEntity {
@@ -194,6 +302,16 @@ public class EntityWither extends EntityMonster implements IRangedEntity {
@Override
protected void mobTick() {
@@ -4638,7 +4638,7 @@ index 53482a420c356fd50e5ab6dd729a271d6594dac7..f68cf834aa65cc4bbb1eb9901586395d
int i;
if (this.getInvul() > 0) {
@@ -372,7 +490,7 @@ public class EntityWither extends EntityMonster implements IRangedEntity {
@@ -377,7 +495,7 @@ public class EntityWither extends EntityMonster implements IRangedEntity {
this.bossBattle.removePlayer(entityplayer);
}
@@ -4647,7 +4647,7 @@ index 53482a420c356fd50e5ab6dd729a271d6594dac7..f68cf834aa65cc4bbb1eb9901586395d
if (i <= 0) {
return this.locX();
} else {
@@ -383,11 +501,11 @@ public class EntityWither extends EntityMonster implements IRangedEntity {
@@ -388,11 +506,11 @@ public class EntityWither extends EntityMonster implements IRangedEntity {
}
}
@@ -4661,7 +4661,7 @@ index 53482a420c356fd50e5ab6dd729a271d6594dac7..f68cf834aa65cc4bbb1eb9901586395d
if (i <= 0) {
return this.locZ();
} else {
@@ -511,7 +629,7 @@ public class EntityWither extends EntityMonster implements IRangedEntity {
@@ -516,7 +634,7 @@ public class EntityWither extends EntityMonster implements IRangedEntity {
}
public static AttributeProvider.Builder eK() {
@@ -4670,7 +4670,7 @@ index 53482a420c356fd50e5ab6dd729a271d6594dac7..f68cf834aa65cc4bbb1eb9901586395d
}
public int getInvul() {
@@ -523,11 +641,11 @@ public class EntityWither extends EntityMonster implements IRangedEntity {
@@ -528,11 +646,11 @@ public class EntityWither extends EntityMonster implements IRangedEntity {
}
public int getHeadTarget(int i) {
@@ -4683,8 +4683,8 @@ index 53482a420c356fd50e5ab6dd729a271d6594dac7..f68cf834aa65cc4bbb1eb9901586395d
+ if (!hasRider()) this.datawatcher.set(EntityWither.bo.get(i), j); // Purpur
}
public boolean S_() {
@@ -541,7 +659,7 @@ public class EntityWither extends EntityMonster implements IRangedEntity {
public final boolean isPowered() { return this.S_(); } // Paper - OBFHELPER
@@ -547,7 +665,7 @@ public class EntityWither extends EntityMonster implements IRangedEntity {
@Override
protected boolean n(Entity entity) {
@@ -4885,7 +4885,7 @@ index cbc0b8bc854ab1b0ba95fa0a2041385f440718d9..89d64ea0d1e61dfce622df026209af12
default int getHeight() {
diff --git a/src/main/java/net/minecraft/server/IProjectile.java b/src/main/java/net/minecraft/server/IProjectile.java
index bbc089b41fcbe0141f13591db2cb44b9e688cac4..63040363fa5ae79ab0f2c31a1257cac2a610bc6a 100644
index dc9f2a1a132b3a7925bd62aa1da0512afd90b8b1..b7e540dfeeabb13227596ecfc6eddabf3cfde537 100644
--- a/src/main/java/net/minecraft/server/IProjectile.java
+++ b/src/main/java/net/minecraft/server/IProjectile.java
@@ -12,7 +12,7 @@ public abstract class IProjectile extends Entity {
@@ -4973,10 +4973,10 @@ index 0000000000000000000000000000000000000000..44929182dfd7ad847d9657c324f440cb
+ }
+}
diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
index e2f97fa2b350c56c7086d89b4f66d07f3668e479..398f883b2e646dc8e90753270d1dece833a80739 100644
index eff58bba46e5cb4bd412fcb65e293d5b9eb58aba..e9485684b7d5ddde72fc388d51cfef679178bad3 100644
--- a/src/main/java/net/minecraft/server/PlayerConnection.java
+++ b/src/main/java/net/minecraft/server/PlayerConnection.java
@@ -2246,6 +2246,8 @@ public class PlayerConnection implements PacketListenerPlayIn {
@@ -2288,6 +2288,8 @@ public class PlayerConnection implements PacketListenerPlayIn {
}
this.server.getPluginManager().callEvent(event);
@@ -6383,10 +6383,10 @@ index a6d849facba1526ae2a2b7f3fb9a140d0b50289c..b56ca054b37f5887e13b481baad8132f
+ // Purpur end
}
diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
index 63d329dca12f902e2fb2a62ee4c86aea6453f1a3..a6963544fe460798ee870d7080939c8ec838398e 100644
index 696ded96e6018bc5289cc20f72d6dc9395d3b6a6..55ab5e078d28de962ec450c575c7f5bb4fa7ce6f 100644
--- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
+++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
@@ -509,6 +509,18 @@ public class CraftEventFactory {
@@ -510,6 +510,18 @@ public class CraftEventFactory {
}
craftServer.getPluginManager().callEvent(event);
@@ -6405,7 +6405,7 @@ index 63d329dca12f902e2fb2a62ee4c86aea6453f1a3..a6963544fe460798ee870d7080939c8e
return event;
}
@@ -909,6 +921,7 @@ public class CraftEventFactory {
@@ -910,6 +922,7 @@ public class CraftEventFactory {
damageCause = DamageCause.ENTITY_EXPLOSION;
}
event = new EntityDamageByEntityEvent(damager.getBukkitEntity(), entity.getBukkitEntity(), damageCause, modifiers, modifierFunctions);
@@ -6413,7 +6413,7 @@ index 63d329dca12f902e2fb2a62ee4c86aea6453f1a3..a6963544fe460798ee870d7080939c8e
}
event.setCancelled(cancelled);
@@ -993,6 +1006,7 @@ public class CraftEventFactory {
@@ -994,6 +1007,7 @@ public class CraftEventFactory {
if (!event.isCancelled()) {
event.getEntity().setLastDamageCause(event);
}
@@ -6421,7 +6421,7 @@ index 63d329dca12f902e2fb2a62ee4c86aea6453f1a3..a6963544fe460798ee870d7080939c8e
return event;
}
@@ -1042,6 +1056,7 @@ public class CraftEventFactory {
@@ -1043,6 +1057,7 @@ public class CraftEventFactory {
EntityDamageEvent event;
if (damager != null) {
event = new EntityDamageByEntityEvent(damager.getBukkitEntity(), damagee.getBukkitEntity(), cause, modifiers, modifierFunctions);

6
patches/server/0111-Entities-can-use-portals-configuration.patch
View File

@@ -5,10 +5,10 @@ Subject: [PATCH] Entities can use portals configuration
diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
index 2bd65dd4c4c4824a7969392f8ded35cbb1f8a0b4..46786324d6bb5150794b518e5c0f0a42d1851f74 100644
index 0115e2c73eff9d5e4c6778e32fc54b9c116b6b22..e4f2e51b6306fcaf161b7dfb734d9d28947e964b 100644
--- a/src/main/java/net/minecraft/server/Entity.java
+++ b/src/main/java/net/minecraft/server/Entity.java
@@ -2423,7 +2423,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -2414,7 +2414,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
public void d(BlockPosition blockposition) {
if (this.ai()) {
this.resetPortalCooldown();
@@ -17,7 +17,7 @@ index 2bd65dd4c4c4824a7969392f8ded35cbb1f8a0b4..46786324d6bb5150794b518e5c0f0a42
if (!this.world.isClientSide && !blockposition.equals(this.ac)) {
this.ac = blockposition.immutableCopy();
}
@@ -3003,7 +3003,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -2994,7 +2994,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
}
public boolean canPortal() {

8
patches/server/0113-Customizable-wither-health-and-healing.patch
View File

@@ -6,10 +6,10 @@ Subject: [PATCH] Customizable wither health and healing
Adds the ability to customize the health of the wither, as well as the amount that it heals, and how often.
diff --git a/src/main/java/net/minecraft/server/EntityWither.java b/src/main/java/net/minecraft/server/EntityWither.java
index f68cf834aa65cc4bbb1eb9901586395d41770955..71b6fc480617f040029b2201f24d05affeb90b70 100644
index 0442b722e5dc7ccc6e607fb3fa7766496b3398d5..9d67ce93573f85d64e8f0a8bd9434c130fc75b17 100644
--- a/src/main/java/net/minecraft/server/EntityWither.java
+++ b/src/main/java/net/minecraft/server/EntityWither.java
@@ -145,6 +145,11 @@ public class EntityWither extends EntityMonster implements IRangedEntity {
@@ -150,6 +150,11 @@ public class EntityWither extends EntityMonster implements IRangedEntity {
skull.setPositionRaw(headX, headY, headZ);
world.addEntity(skull);
}
@@ -21,7 +21,7 @@ index f68cf834aa65cc4bbb1eb9901586395d41770955..71b6fc480617f040029b2201f24d05af
// Purpur end
@Override
@@ -348,7 +353,7 @@ public class EntityWither extends EntityMonster implements IRangedEntity {
@@ -353,7 +358,7 @@ public class EntityWither extends EntityMonster implements IRangedEntity {
this.setInvul(i);
if (this.ticksLived % 10 == 0) {
@@ -30,7 +30,7 @@ index f68cf834aa65cc4bbb1eb9901586395d41770955..71b6fc480617f040029b2201f24d05af
}
} else {
@@ -457,8 +462,10 @@ public class EntityWither extends EntityMonster implements IRangedEntity {
@@ -462,8 +467,10 @@ public class EntityWither extends EntityMonster implements IRangedEntity {
}
}

20
patches/server/0116-Despawn-rate-config-options-per-projectile-type.patch
View File

@@ -6,7 +6,7 @@ Subject: [PATCH] Despawn rate config options per projectile type
Default values of -1 respect vanilla behaviour.
diff --git a/src/main/java/net/minecraft/server/EntityArrow.java b/src/main/java/net/minecraft/server/EntityArrow.java
index 1e7f5957d879d1ba8cf2b29cf9397b8e204e4381..7f89b269e37e1046a64c62e1db2a37e6aa4cd54c 100644
index f983516b89cdf7ce7fdea8f5a5b1a29dd01ae597..74529a297540ea9c69952d88fe3bb5a13816dcef 100644
--- a/src/main/java/net/minecraft/server/EntityArrow.java
+++ b/src/main/java/net/minecraft/server/EntityArrow.java
@@ -23,7 +23,7 @@ public abstract class EntityArrow extends IProjectile {
@@ -18,7 +18,7 @@ index 1e7f5957d879d1ba8cf2b29cf9397b8e204e4381..7f89b269e37e1046a64c62e1db2a37e6
private double damage;
public int knockbackStrength;
private SoundEffect ak;
@@ -255,13 +255,23 @@ public abstract class EntityArrow extends IProjectile {
@@ -257,13 +257,23 @@ public abstract class EntityArrow extends IProjectile {
}
@@ -96,10 +96,10 @@ index 63b4a449b56ef549830e4bbd3eab116e64379189..e8650c1bfa8f94ba461b709412567911
+ // Purpur end
}
diff --git a/src/main/java/net/minecraft/server/EntityFireworks.java b/src/main/java/net/minecraft/server/EntityFireworks.java
index a646dc9f030ad1f76ba2b7bb1bc7897cd34b648c..9789d480ad2b6da6874004c068a298ed9c69a4e3 100644
index dd18eabd7104995f0e6a8ecb279a3872b46773de..601f639275f4df983f19aa9cb0dc5f2611387853 100644
--- a/src/main/java/net/minecraft/server/EntityFireworks.java
+++ b/src/main/java/net/minecraft/server/EntityFireworks.java
@@ -298,4 +298,11 @@ public class EntityFireworks extends IProjectile {
@@ -300,4 +300,11 @@ public class EntityFireworks extends IProjectile {
public Packet<?> P() {
return new PacketPlayOutSpawnEntity(this);
}
@@ -112,10 +112,10 @@ index a646dc9f030ad1f76ba2b7bb1bc7897cd34b648c..9789d480ad2b6da6874004c068a298ed
+ // Purpur end
}
diff --git a/src/main/java/net/minecraft/server/EntityFishingHook.java b/src/main/java/net/minecraft/server/EntityFishingHook.java
index e97c7794e86c0518bcec0a0370bffbeab20e2623..7fcee87cdcd15a17b9019fa40f30cae688272294 100644
index 0816ab54bc99bcf29356b56516e83759a3f2988f..2bad182d9d6248c1e8ac9138e46d192dccc2a973 100644
--- a/src/main/java/net/minecraft/server/EntityFishingHook.java
+++ b/src/main/java/net/minecraft/server/EntityFishingHook.java
@@ -576,4 +576,11 @@ public class EntityFishingHook extends IProjectile {
@@ -578,4 +578,11 @@ public class EntityFishingHook extends IProjectile {
private HookState() {}
}
@@ -144,10 +144,10 @@ index b4b0dfbc70f91f74f9792b835ec2f8d5af41c311..d12de20cf4bb2345c616d3cc0b9f50bd
+ // Purpur end
}
diff --git a/src/main/java/net/minecraft/server/EntityLlamaSpit.java b/src/main/java/net/minecraft/server/EntityLlamaSpit.java
index 7636a51a7ef0aa05b5b2aaa9d17e7b551dedac96..3e6438c9778ec6c9f62ac74d97fb5108944d0952 100644
index 480a02a8f6ec7110f9af8f2037fdc09a7a54ef01..aa9afb60808a9988b38cf588ec9f649ee09c728e 100644
--- a/src/main/java/net/minecraft/server/EntityLlamaSpit.java
+++ b/src/main/java/net/minecraft/server/EntityLlamaSpit.java
@@ -71,4 +71,11 @@ public class EntityLlamaSpit extends IProjectile {
@@ -73,4 +73,11 @@ public class EntityLlamaSpit extends IProjectile {
public Packet<?> P() {
return new PacketPlayOutSpawnEntity(this);
}
@@ -176,7 +176,7 @@ index ddf1f80f3ba45e09cd13ca646a8ec6e8d47be555..bd84a3ac6146cfe6952a9334820696b4
+ // Purpur end
}
diff --git a/src/main/java/net/minecraft/server/EntityShulkerBullet.java b/src/main/java/net/minecraft/server/EntityShulkerBullet.java
index 23017b5486530bcf76b3934cfa8621e8b4772b27..0b16473aedfca996d1f6767bead4a2191df1df9e 100644
index a4d94385ede0303417d676155c2c0b226681cc59..da38bdd6055d06005cfee3e73c32230ad7b480ff 100644
--- a/src/main/java/net/minecraft/server/EntityShulkerBullet.java
+++ b/src/main/java/net/minecraft/server/EntityShulkerBullet.java
@@ -313,4 +313,11 @@ public class EntityShulkerBullet extends IProjectile {
@@ -257,7 +257,7 @@ index 2c02e114cce1f49b643e75e7ab3c05be716d7dba..4a97a7517dc1a2a25c578d9e168240cc
+ // Purpur end
}
diff --git a/src/main/java/net/minecraft/server/IProjectile.java b/src/main/java/net/minecraft/server/IProjectile.java
index 63040363fa5ae79ab0f2c31a1257cac2a610bc6a..1c79f58ce2a48745c9790cd04d6d6054b9eb6ed4 100644
index b7e540dfeeabb13227596ecfc6eddabf3cfde537..56adefabdfbf444e87129715f107c6d3aafe4ca7 100644
--- a/src/main/java/net/minecraft/server/IProjectile.java
+++ b/src/main/java/net/minecraft/server/IProjectile.java
@@ -13,11 +13,25 @@ public abstract class IProjectile extends Entity {

4
patches/server/0127-Arrows-should-not-reset-despawn-counter.patch
View File

@@ -7,10 +7,10 @@ This prevents keeping arrows alive indefinitely (such as when the block
the arrow is stuck in gets removed, like a piston head going up/down)
diff --git a/src/main/java/net/minecraft/server/EntityArrow.java b/src/main/java/net/minecraft/server/EntityArrow.java
index 7f89b269e37e1046a64c62e1db2a37e6aa4cd54c..5ec8c9484de64b956ec31b578a2a337340d70339 100644
index 74529a297540ea9c69952d88fe3bb5a13816dcef..2e11286e2baffa66bea9570b0377478cd45fac1e 100644
--- a/src/main/java/net/minecraft/server/EntityArrow.java
+++ b/src/main/java/net/minecraft/server/EntityArrow.java
@@ -243,7 +243,7 @@ public abstract class EntityArrow extends IProjectile {
@@ -245,7 +245,7 @@ public abstract class EntityArrow extends IProjectile {
Vec3D vec3d = this.getMot();
this.setMot(vec3d.d((double) (this.random.nextFloat() * 0.2F), (double) (this.random.nextFloat() * 0.2F), (double) (this.random.nextFloat() * 0.2F)));

2
patches/server/0131-Make-animal-breeding-times-configurable.patch
View File

@@ -46,7 +46,7 @@ index d8354ec4d19fc3fbddc2551ee217acb137482e63..ded4e10f5082fb5aa25368d9035affba
@Override
diff --git a/src/main/java/net/minecraft/server/EntityCat.java b/src/main/java/net/minecraft/server/EntityCat.java
index 05929d5c539a738e6b6e8d32d9b0f843a665f4f6..a6ce4ca27c9670655a8f66bfc624f12659613379 100644
index 700314b02abb355e6a600d744887a705cbcfb4e4..8346db6c8521064ff51445a0da747a2d70d14633 100644
--- a/src/main/java/net/minecraft/server/EntityCat.java
+++ b/src/main/java/net/minecraft/server/EntityCat.java
@@ -58,6 +58,11 @@ public class EntityCat extends EntityTameableAnimal {

4
patches/server/0137-Add-critical-hit-check-to-EntityDamagedByEntityEvent.patch
View File

@@ -33,10 +33,10 @@ index aef1dc47f2025f09d650a04f6dfa867d5ea1b65a..c973a1f1aecd47f11a12c94325cc18c3
if (flag5) {
if (i > 0) {
diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
index a6963544fe460798ee870d7080939c8ec838398e..c6402e5c712744a807242e0421cd3383f6ba085f 100644
index 55ab5e078d28de962ec450c575c7f5bb4fa7ce6f..533051ec74a64ef6893d848eb4579166d26c6bf7 100644
--- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
+++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
@@ -1055,7 +1055,7 @@ public class CraftEventFactory {
@@ -1056,7 +1056,7 @@ public class CraftEventFactory {
private static EntityDamageEvent callEntityDamageEvent(Entity damager, Entity damagee, DamageCause cause, Map<DamageModifier, Double> modifiers, Map<DamageModifier, Function<? super Double, Double>> modifierFunctions, boolean cancelled) {
EntityDamageEvent event;
if (damager != null) {

4
patches/server/0147-PaperPR-Config-option-for-Piglins-guarding-chests.patch
View File

@@ -5,10 +5,10 @@ Subject: [PATCH] PaperPR - Config option for Piglins guarding chests
diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
index 89f3a28c20f0e4db4650c435dbcbc923b7bde8aa..5c7e3c2671c0f8a3966a61e2652b8bb64f79a83e 100644
index 4735dcba31b556fafe9c7d7440c89e940755c81f..78250d7db036198ec7119a065444c9253c1ab043 100644
--- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
+++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
@@ -698,6 +698,11 @@ public class PaperWorldConfig {
@@ -704,6 +704,11 @@ public class PaperWorldConfig {
zombiesTargetTurtleEggs = getBoolean("zombies-target-turtle-eggs", zombiesTargetTurtleEggs);
}

2
patches/server/0150-Lobotomize-stuck-villagers.patch
View File

@@ -5,7 +5,7 @@ Subject: [PATCH] Lobotomize stuck villagers
diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
index 46786324d6bb5150794b518e5c0f0a42d1851f74..b26a2b9b71f4a3a5b40612d5737500211fbefe15 100644
index e4f2e51b6306fcaf161b7dfb734d9d28947e964b..cb4856e3bbb25e1077f5b4832f359549d57acd7e 100644
--- a/src/main/java/net/minecraft/server/Entity.java
+++ b/src/main/java/net/minecraft/server/Entity.java
@@ -114,7 +114,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke

2
patches/server/0156-Configurable-entity-base-attributes.patch
View File

@@ -60,7 +60,7 @@ index dcfad16e06450068d5801fc002c9650102dbf995..90b90fa33b39020189a1d4a5826fa3ab
@Override
diff --git a/src/main/java/net/minecraft/server/EntityCat.java b/src/main/java/net/minecraft/server/EntityCat.java
index a6ce4ca27c9670655a8f66bfc624f12659613379..16623cc1670422b5b1fa1cabb24a4052358de0fc 100644
index 8346db6c8521064ff51445a0da747a2d70d14633..e411da6f0f55b965fe9e303cf3b56201d33cd260 100644
--- a/src/main/java/net/minecraft/server/EntityCat.java
+++ b/src/main/java/net/minecraft/server/EntityCat.java
@@ -63,6 +63,11 @@ public class EntityCat extends EntityTameableAnimal {

2
patches/server/0158-Option-for-chests-to-open-even-with-a-solid-block-on.patch
View File

@@ -5,7 +5,7 @@ Subject: [PATCH] Option for chests to open even with a solid block on top
diff --git a/src/main/java/net/minecraft/server/BlockChest.java b/src/main/java/net/minecraft/server/BlockChest.java
index 9e5e6de52efabe9126f6c47acb35fa1dc461ff4f..487b281cf53d3482853d56ee1e90a329d516395f 100644
index c4ff93a6b908c1bd157c7fe45b504909b189d09c..71a32a317e38b9c8f802fd5dd9ae546fb46eb020 100644
--- a/src/main/java/net/minecraft/server/BlockChest.java
+++ b/src/main/java/net/minecraft/server/BlockChest.java
@@ -262,6 +262,7 @@ public class BlockChest extends BlockChestAbstract<TileEntityChest> implements I

8
patches/server/0161-PlayerBookTooLargeEvent.patch
View File

@@ -5,10 +5,10 @@ Subject: [PATCH] PlayerBookTooLargeEvent
diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
index 398f883b2e646dc8e90753270d1dece833a80739..e3cdeb2d899957901e99f0f997af92505cbe4582 100644
index e9485684b7d5ddde72fc388d51cfef679178bad3..75d955948a407d94e6f3a88f86afa8b1d6ba33cb 100644
--- a/src/main/java/net/minecraft/server/PlayerConnection.java
+++ b/src/main/java/net/minecraft/server/PlayerConnection.java
@@ -930,6 +930,7 @@ public class PlayerConnection implements PacketListenerPlayIn {
@@ -941,6 +941,7 @@ public class PlayerConnection implements PacketListenerPlayIn {
NBTTagList pageList = testStack.getTag().getList("pages", 8);
if (pageList.size() > 100) {
PlayerConnection.LOGGER.warn(this.player.getName() + " tried to send a book with too many pages");
@@ -16,7 +16,7 @@ index 398f883b2e646dc8e90753270d1dece833a80739..e3cdeb2d899957901e99f0f997af9250
minecraftServer.scheduleOnMain(() -> this.disconnect("Book too large!"));
return;
}
@@ -942,6 +943,7 @@ public class PlayerConnection implements PacketListenerPlayIn {
@@ -953,6 +954,7 @@ public class PlayerConnection implements PacketListenerPlayIn {
int byteLength = testString.getBytes(java.nio.charset.StandardCharsets.UTF_8).length;
if (byteLength > 256 * 4) {
PlayerConnection.LOGGER.warn(this.player.getName() + " tried to send a book with with a page too large!");
@@ -24,7 +24,7 @@ index 398f883b2e646dc8e90753270d1dece833a80739..e3cdeb2d899957901e99f0f997af9250
minecraftServer.scheduleOnMain(() -> this.disconnect("Book too large!"));
return;
}
@@ -965,6 +967,7 @@ public class PlayerConnection implements PacketListenerPlayIn {
@@ -976,6 +978,7 @@ public class PlayerConnection implements PacketListenerPlayIn {
if (byteTotal > byteAllowed) {
PlayerConnection.LOGGER.warn(this.player.getName() + " tried to send too large of a book. Book Size: " + byteTotal + " - Allowed: "+ byteAllowed + " - Pages: " + pageList.size());

6
patches/server/0165-Add-mobGriefing-bypass-to-everything-affected.patch
View File

@@ -246,10 +246,10 @@ index 319bb68f27f360bb36897c73a68ddeac64b67a6f..550decf12140596e63b57a7ee5940e4f
}
diff --git a/src/main/java/net/minecraft/server/EntityWither.java b/src/main/java/net/minecraft/server/EntityWither.java
index 71b6fc480617f040029b2201f24d05affeb90b70..48d27d58358e0568579d69320f47e751ea4ec37a 100644
index 9d67ce93573f85d64e8f0a8bd9434c130fc75b17..c6a687ffa92bea750b922dfe92bf715a476967e6 100644
--- a/src/main/java/net/minecraft/server/EntityWither.java
+++ b/src/main/java/net/minecraft/server/EntityWither.java
@@ -317,7 +317,7 @@ public class EntityWither extends EntityMonster implements IRangedEntity {
@@ -322,7 +322,7 @@ public class EntityWither extends EntityMonster implements IRangedEntity {
if (this.getInvul() > 0) {
i = this.getInvul() - 1;
if (i <= 0) {
@@ -258,7 +258,7 @@ index 71b6fc480617f040029b2201f24d05affeb90b70..48d27d58358e0568579d69320f47e751
// CraftBukkit start
// this.world.createExplosion(this, this.locX(), this.getHeadY(), this.locZ(), 7.0F, false, explosion_effect);
ExplosionPrimeEvent event = new ExplosionPrimeEvent(this.getBukkitEntity(), 7.0F, false);
@@ -429,7 +429,7 @@ public class EntityWither extends EntityMonster implements IRangedEntity {
@@ -434,7 +434,7 @@ public class EntityWither extends EntityMonster implements IRangedEntity {
if (this.bw > 0) {
--this.bw;

2
patches/server/0168-Add-StructureGenerateEvent.patch
View File

@@ -19,7 +19,7 @@ along with this program. If not, see <https://www.gnu.org/licenses/>.
Co-authored-by: Mariell Hoversholm <proximyst@proximyst.com>
diff --git a/src/main/java/net/minecraft/server/ChunkGenerator.java b/src/main/java/net/minecraft/server/ChunkGenerator.java
index 097cb9896c525a605c50e83548f828e0c71ab3d5..8a0d01d2bab4a28aa3c075534bc70b6e835810ef 100644
index 17cf00dfe8b24adf2fb66eca4710ab7888a894e3..6223d1d9048e31fb10cec7f485d1556aec2c7d5e 100644
--- a/src/main/java/net/minecraft/server/ChunkGenerator.java
+++ b/src/main/java/net/minecraft/server/ChunkGenerator.java
@@ -251,6 +251,14 @@ public abstract class ChunkGenerator {

4
patches/server/0170-Movement-options-for-armour-stands.patch
View File

@@ -17,10 +17,10 @@ You should have received a copy of the GNU General Public License
along with this program. If not, see <https://www.gnu.org/licenses/>.
diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
index b26a2b9b71f4a3a5b40612d5737500211fbefe15..31642841b2954dacdebed8d40f81381330fcfcab 100644
index cb4856e3bbb25e1077f5b4832f359549d57acd7e..41844f30a2a98eb14559b3ab0885ae738b54520c 100644
--- a/src/main/java/net/minecraft/server/Entity.java
+++ b/src/main/java/net/minecraft/server/Entity.java
@@ -1369,7 +1369,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -1360,7 +1360,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
return this.isInWater() || flag;
}

4
patches/server/0171-Fix-stuck-in-portals.patch
View File

@@ -5,10 +5,10 @@ Subject: [PATCH] Fix stuck in portals
diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
index 31642841b2954dacdebed8d40f81381330fcfcab..6861683cf060df4f173ffc01ebd9de70b8c92667 100644
index 41844f30a2a98eb14559b3ab0885ae738b54520c..63eb29635957d4e6ce1274ee17a59af62d442d4e 100644
--- a/src/main/java/net/minecraft/server/Entity.java
+++ b/src/main/java/net/minecraft/server/Entity.java
@@ -2420,12 +2420,15 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -2411,12 +2411,15 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
return new Vec2F(this.pitch, this.yaw);
}