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

Updated Upstream (Paper)

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

Paper Changes:
0fc6213f9c Allow skipping writing of comments to server.properties (#6251)
aec9781f52 Fix incorrect colors in ConsoleCommandSender messages with TranslatableComponents (#6287)
9a74e70cc0 fix: boats' bounding boxes must be deflated, not inflated (#6314)
6226208d64 Fix SysoutCatcher when plugins log before initialisation (Fixes #6323)
d239eca9dd Fix writing server.properties with wrong encoding (#6322)
f521a18a17 Updated Upstream (Bukkit/CraftBukkit)
This commit is contained in:
William Blake Galbreath
2021-08-06 01:07:04 -05:00
parent d3a45fc041
commit 956156df48
13 changed files with 25 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
patches/api/0020-ItemStack-convenience-methods.patch
View File

@@ -5,10 +5,10 @@ Subject: [PATCH] ItemStack convenience methods
diff --git a/src/main/java/org/bukkit/Material.java b/src/main/java/org/bukkit/Material.java
index d635c4fb85d3eeea3853037b2da5881c4853b193..a51f4a3f77cfb946dc3b9fc8e367d6f08377a6de 100644
index 08eb0cc65308c5d4078814a0bccf84142737e87a..1f113c6befc2498b3770eb5dd61a69a9ea962bd6 100644
--- a/src/main/java/org/bukkit/Material.java
+++ b/src/main/java/org/bukkit/Material.java
@@ -9822,4 +9822,40 @@ public enum Material implements Keyed {
@@ -9819,4 +9819,40 @@ public enum Material implements Keyed {
// </editor-fold>
}
}

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

@@ -33285,7 +33285,7 @@ index baa25df9f446c8edea9666983425df31c32a13ff..f9ed48f5bbde84fd1804e482f2777b51
public void onTrackingStart(Entity entity) {
diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
index e32da100eabf0d3de12375402e9378c726811358..1c9aec21aa22d0d202a023e9252d1412685ed4b0 100644
index 82eaf3bd7332b173197d81eaebdf58c6f43d6a23..8e795c9380eb0379838ab4881ba6393d57e8e92c 100644
--- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
+++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
@@ -261,7 +261,7 @@ public class ServerPlayer extends Player {
@@ -33315,7 +33315,7 @@ index e32da100eabf0d3de12375402e9378c726811358..1c9aec21aa22d0d202a023e9252d1412
this.setPos(this.getX(), this.getY() + 1.0D, this.getZ());
}
}
@@ -1558,6 +1558,18 @@ public class ServerPlayer extends Player {
@@ -1562,6 +1562,18 @@ public class ServerPlayer extends Player {
this.connection.send(new ClientboundContainerClosePacket(this.containerMenu.containerId));
this.doCloseContainer();
}
@@ -38556,7 +38556,7 @@ index 7dc26321e20e26821096e79356a358879306cd78..2e79e2a23a4aec4b526814f7e959232c
// Spigot start
private final org.bukkit.World.Spigot spigot = new org.bukkit.World.Spigot()
diff --git a/src/main/java/org/bukkit/craftbukkit/Main.java b/src/main/java/org/bukkit/craftbukkit/Main.java
index ea7df53656766a8dc4ab5fe66de894301db634e1..b153a8c9e7fdf5560148f02ba2f52c37ad3b5ace 100644
index eb0c436414a66c530d888348c3190eb563b8b44f..4bd8823bfee3fcdeba5c5b7aae3489a92c2ac536 100644
--- a/src/main/java/org/bukkit/craftbukkit/Main.java
+++ b/src/main/java/org/bukkit/craftbukkit/Main.java
@@ -146,6 +146,13 @@ public class Main {

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

@@ -5,10 +5,10 @@ Subject: [PATCH] Component related conveniences
diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
index 0f87a808432e46174d3494d92f2b1a5e7f663b1a..2aea5ddba1d5c4dd0afeaee58a3542d0c0000edd 100644
index a45a43dd6e48433ecbbbf3ef475fbba9c0531d19..3802a1dc3997704031d22165f60f854f50bda9d6 100644
--- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
+++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
@@ -1674,6 +1674,26 @@ public class ServerPlayer extends Player {
@@ -1678,6 +1678,26 @@ public class ServerPlayer extends Player {
}
// CraftBukkit end

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

@@ -46,7 +46,7 @@ index f9ed48f5bbde84fd1804e482f2777b516cc3a1ef..29b841462037fa97f72971c490b617d1
return new Throwable(entity + " Added to world at " + new java.util.Date());
}
diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
index 2aea5ddba1d5c4dd0afeaee58a3542d0c0000edd..53806589d0138e43e50c4ca7c1e6fc9a3317d38c 100644
index 3802a1dc3997704031d22165f60f854f50bda9d6..871b006b99d3872bc8a5a238227a1624fc493eac 100644
--- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
+++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
@@ -665,6 +665,15 @@ public class ServerPlayer extends Player {
@@ -65,7 +65,7 @@ index 2aea5ddba1d5c4dd0afeaee58a3542d0c0000edd..53806589d0138e43e50c4ca7c1e6fc9a
}
public void doTick() {
@@ -2411,4 +2420,6 @@ public class ServerPlayer extends Player {
@@ -2416,4 +2425,6 @@ public class ServerPlayer extends Player {
return (CraftPlayer) super.getBukkitEntity();
}
// CraftBukkit end

4
patches/server/0012-AFK-API.patch
View File

@@ -5,10 +5,10 @@ Subject: [PATCH] AFK API
diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
index 53806589d0138e43e50c4ca7c1e6fc9a3317d38c..a0d2480021b5cb4ae7e28d25869d78209a6096c2 100644
index 871b006b99d3872bc8a5a238227a1624fc493eac..934d24bae4a5d6780434a0918c04dfffc12f2364 100644
--- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
+++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
@@ -1949,8 +1949,58 @@ public class ServerPlayer extends Player {
@@ -1953,8 +1953,58 @@ public class ServerPlayer extends Player {
public void resetLastActionTime() {
this.lastActionTime = Util.getMillis();

8
patches/server/0020-Player-invulnerabilities.patch
View File

@@ -5,7 +5,7 @@ Subject: [PATCH] Player invulnerabilities
diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
index a0d2480021b5cb4ae7e28d25869d78209a6096c2..a53e68deb6b5fb9c43bce9444373b68e25a6a344 100644
index 934d24bae4a5d6780434a0918c04dfffc12f2364..da8a924faf6ed16f2cf669439f5ba1175b1b8cc0 100644
--- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
+++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
@@ -259,6 +259,7 @@ public class ServerPlayer extends Player {
@@ -54,7 +54,7 @@ index a0d2480021b5cb4ae7e28d25869d78209a6096c2..a53e68deb6b5fb9c43bce9444373b68e
return this;
}
}
@@ -1939,6 +1948,7 @@ public class ServerPlayer extends Player {
@@ -1943,6 +1952,7 @@ public class ServerPlayer extends Player {
}
public void sendTexturePack(String url, String hash, boolean required, @Nullable Component resourcePackPrompt) {
@@ -62,7 +62,7 @@ index a0d2480021b5cb4ae7e28d25869d78209a6096c2..a53e68deb6b5fb9c43bce9444373b68e
this.connection.send(new ClientboundResourcePackPacket(url, hash, required, resourcePackPrompt));
}
@@ -2422,9 +2432,17 @@ public class ServerPlayer extends Player {
@@ -2426,9 +2436,17 @@ public class ServerPlayer extends Player {
@Override
public boolean isImmobile() {
@@ -82,7 +82,7 @@ index a0d2480021b5cb4ae7e28d25869d78209a6096c2..a53e68deb6b5fb9c43bce9444373b68e
public Scoreboard getScoreboard() {
return this.getBukkitEntity().getScoreboard().getHandle();
diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
index c6ef86206fc498a0fcd1c1527516d98e00a5df40..5ae1002dde94a242fd6c19bb22a52416eba229f2 100644
index f6a091ab2f549761b8d19fb35e1db907954a9717..e4b9edb4226ce3213181b6deb2fca6e9fab3e569 100644
--- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
+++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
@@ -1912,12 +1912,21 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser

6
patches/server/0084-Add-option-to-teleport-to-spawn-if-outside-world-bor.patch
View File

@@ -5,10 +5,10 @@ Subject: [PATCH] Add option to teleport to spawn if outside world border
diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
index edaff3eb46fd1de456acbc465d644ac9454022d3..48bad15686c38c02d2c933c6360edf7a90950039 100644
index 39f3b87b8b07f9ea0748f31419fd78e3911e97b1..f60d7aa4ddfb9b0889b4509c5844812219ce4121 100644
--- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
+++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
@@ -2491,5 +2491,25 @@ public class ServerPlayer extends Player {
@@ -2496,5 +2496,25 @@ public class ServerPlayer extends Player {
}
// CraftBukkit end
@@ -35,7 +35,7 @@ index edaff3eb46fd1de456acbc465d644ac9454022d3..48bad15686c38c02d2c933c6360edf7a
+ // Purpur end
}
diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
index f1a8b91f620152a3da3c11769c3c2353ccdba3cf..0c14ccc74abcc68ecc5422b38bc729dc659b9b8b 100644
index 9240dac662e60d130cdb8c3724c211c89875f6f0..795d454e46cfa39f80c5fc931f4931d8561b03b4 100644
--- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
+++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
@@ -45,6 +45,7 @@ import net.minecraft.network.syncher.EntityDataAccessor;

4
patches/server/0120-Apply-display-names-from-item-forms-of-entities-to-e.patch
View File

@@ -101,7 +101,7 @@ index 44d63145480d38a4ec3a38be108200af070bcffa..7de67b75010f0da52004c911f6ee98eb
world.playSound((Player) null, entityarmorstand.getX(), entityarmorstand.getY(), entityarmorstand.getZ(), SoundEvents.ARMOR_STAND_PLACE, SoundSource.BLOCKS, 0.75F, 0.8F);
world.gameEvent((Entity) context.getPlayer(), GameEvent.ENTITY_PLACE, (Entity) entityarmorstand);
diff --git a/src/main/java/net/minecraft/world/item/BoatItem.java b/src/main/java/net/minecraft/world/item/BoatItem.java
index 87e0faaab1ec98123fd735112d15da332a830554..daf24491886c3a5cb031389bfed8e62a6e62afe3 100644
index 9a11248b13d231c1797e14f843cb8cbec0d35a6e..eb8f15432200856dc49129a4a3fe1ee1ae516d02 100644
--- a/src/main/java/net/minecraft/world/item/BoatItem.java
+++ b/src/main/java/net/minecraft/world/item/BoatItem.java
@@ -67,6 +67,11 @@ public class BoatItem extends Item {
@@ -113,7 +113,7 @@ index 87e0faaab1ec98123fd735112d15da332a830554..daf24491886c3a5cb031389bfed8e62a
+ entityboat.setCustomName(itemstack.getHoverName());
+ }
+ // Purpur end
if (!world.noCollision(entityboat, entityboat.getBoundingBox().inflate(net.minecraft.Util.COLLISION_EPSILON))) {
if (!world.noCollision(entityboat, entityboat.getBoundingBox().inflate(-net.minecraft.Util.COLLISION_EPSILON))) { // Paper
return InteractionResultHolder.fail(itemstack);
} else {
diff --git a/src/main/java/net/minecraft/world/item/HangingEntityItem.java b/src/main/java/net/minecraft/world/item/HangingEntityItem.java

4
patches/server/0142-Implement-TPSBar.patch
View File

@@ -42,7 +42,7 @@ index fc6a6e88486c5c2dca1b10bfeae24124690d7b8d..7b66b301b10158e9c715834b24bdfab1
}
}
diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
index 7684f55d2f9f85c14763dfa4fc4c4dc49711b841..48ecf94e218094ea291776cd54ad81fca325848f 100644
index 2b38cfc74840bd3bab6312a72973e301d09fcde4..b88c7eac66248f82d6d7108dbec09bdd431f9e69 100644
--- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
+++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
@@ -260,6 +260,7 @@ public class ServerPlayer extends Player {
@@ -69,7 +69,7 @@ index 7684f55d2f9f85c14763dfa4fc4c4dc49711b841..48ecf94e218094ea291776cd54ad81fc
}
// CraftBukkit start - World fallback code, either respawn location or global spawn
@@ -2520,5 +2523,13 @@ public class ServerPlayer extends Player {
@@ -2525,5 +2528,13 @@ public class ServerPlayer extends Player {
this.server.getPlayerList().moveToWorld(this, toLevel, true, to, !toLevel.paperConfig.disableTeleportationSuffocationCheck);
}
}

4
patches/server/0237-Add-compass-command.patch
View File

@@ -17,7 +17,7 @@ index 528fd87ae1c1c01e13885d88fc8056b0f932fb61..bfad241892b8280d261ab8301245b91b
if (environment.includeIntegrated) {
diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
index 1156b34fa5d19042621caafa4aaeae8020cd646d..ad03eb867af1dbaf50d9c65461f0477d8911d883 100644
index 5283d0d27da27f0946905f30ef7a8265175952fb..087c29cf45e45f769096a2a890befd959f49ca36 100644
--- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
+++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
@@ -261,6 +261,7 @@ public class ServerPlayer extends Player {
@@ -44,7 +44,7 @@ index 1156b34fa5d19042621caafa4aaeae8020cd646d..ad03eb867af1dbaf50d9c65461f0477d
}
// CraftBukkit start - World fallback code, either respawn location or global spawn
@@ -2533,5 +2536,13 @@ public class ServerPlayer extends Player {
@@ -2538,5 +2541,13 @@ public class ServerPlayer extends Player {
public void tpsBar(boolean tpsBar) {
this.tpsBar = tpsBar;
}

19
patches/server/0239-Fix-boat-placements.patch
View File

@@ -1,19 +0,0 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <blake.galbreath@gmail.com>
Date: Mon, 2 Aug 2021 16:10:12 -0500
Subject: [PATCH] Fix boat placements
diff --git a/src/main/java/net/minecraft/world/item/BoatItem.java b/src/main/java/net/minecraft/world/item/BoatItem.java
index daf24491886c3a5cb031389bfed8e62a6e62afe3..861a8cdbcf7dff01e70e1d20b30bfe13c7164401 100644
--- a/src/main/java/net/minecraft/world/item/BoatItem.java
+++ b/src/main/java/net/minecraft/world/item/BoatItem.java
@@ -72,7 +72,7 @@ public class BoatItem extends Item {
entityboat.setCustomName(itemstack.getHoverName());
}
// Purpur end
- if (!world.noCollision(entityboat, entityboat.getBoundingBox().inflate(net.minecraft.Util.COLLISION_EPSILON))) {
+ if (!world.noCollision(entityboat, entityboat.getBoundingBox().inflate(-0.01D))) {
return InteractionResultHolder.fail(itemstack);
} else {
if (!world.isClientSide) {

0
patches/server/0240-Toggle-for-kinetic-damage.patch → patches/server/0239-Toggle-for-kinetic-damage.patch
View File