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:
415f7ca165 Updated Upstream (Bukkit/CraftBukkit)
37df95b189 refactor: do not import List; use FQN
5c65546f5c rebase
fdef125b19 Expose EntityType#getTranslationKey
4d9b14efa4 Use AsyncAppender instead of AsyncLoggerContextSelector to keep loggging IO off main thread (#6381)
8c2adf8e9e Add warning to getOfflinePlayers (#6365)
370b60de14 Optimize indirect passenger iteration (#6366)
80836709e7 Fix block drops position losing precision millions of blocks out (#6387)
e942509e73 Updated Upstream (Bukkit/CraftBukkit/Spigot) (#6379)
ce43ce8265 Make EntityUnleashEvent cancellable (#4993)
591cac3685 Configurable item frame map cursor interval (#6385)
e9aa9ce66b Add config migration for named entity death logging option (#6390)
c2f47a76ae Implement Translatable in appropriate places (#6248)
f12a7f57e1 Clear bucket NBT after dispense (#6391)
4dd33cb8b6 [ci skip] Drop "Fix CME on adding a passenger in CreatureSpawnEvent" (#6384)
565cd3306c [ci skip] Add some helper methods to the ObfHelper util class (#6374)

Tuinity Changes:
6fd7e2b376 Update paper
This commit is contained in:
William Blake Galbreath
2021-08-14 16:40:10 -05:00
parent 158ae61463
commit 635d108ae2
67 changed files with 276 additions and 329 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
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 660f7fbbdd88b8eb2b58aed03925ee63db924a7c..ce796a2cc083ffc5497cdb3bac9da87ea4ba94a7 100644
index 6d25b3397a45d77b96d04a5b099d58a092d43177..651423979d4d5acbcf0bc25d6225a72a16e21826 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 660f7fbbdd88b8eb2b58aed03925ee63db924a7c..ce796a2cc083ffc5497cdb3bac9da87e
}
public void doTick() {
@@ -2437,4 +2446,6 @@ public class ServerPlayer extends Player {
@@ -2439,4 +2448,6 @@ public class ServerPlayer extends Player {
return (CraftPlayer) super.getBukkitEntity();
}
// CraftBukkit end
@@ -86,7 +86,7 @@ index f99d06e53856c14f5b94c28d379b8188ac1411db..c02b3cdd93df7806d52138b02612dd48
if ((entity instanceof AbstractFish && origItem != null && origItem.asItem() == Items.WATER_BUCKET) && (event.isCancelled() || ServerGamePacketListenerImpl.this.player.getInventory().getSelected() == null || ServerGamePacketListenerImpl.this.player.getInventory().getSelected().getItem() != origItem)) {
ServerGamePacketListenerImpl.this.send(new ClientboundAddMobPacket((AbstractFish) entity));
diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
index 28d7e18c9b53b7563b9c4af9afde4e1261d454e4..08efd9b12786077e4f6ae1bfffb912d317f4f418 100644
index 4425095e6dd259d69cdf318e463e31050e79a7de..4cbbe95d3bf14479baa15069d30972471c3bbf0b 100644
--- a/src/main/java/net/minecraft/world/entity/Entity.java
+++ b/src/main/java/net/minecraft/world/entity/Entity.java
@@ -230,7 +230,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, n
@@ -135,7 +135,7 @@ index 28d7e18c9b53b7563b9c4af9afde4e1261d454e4..08efd9b12786077e4f6ae1bfffb912d3
if (this.passengers.size() == 1 && this.passengers.get(0) == entity) {
this.passengers = ImmutableList.of();
} else {
@@ -4213,4 +4227,41 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, n
@@ -4228,4 +4242,41 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, n
return ((ServerChunkCache) level.getChunkSource()).isPositionTicking(this);
}
// Paper end
@@ -201,7 +201,7 @@ index d28cecd9bea7c82fa675d333810e2e63a91c615e..8f8bc29d847801938e251904b8334b4b
protected ParticleOptions getInkParticle() {
return ParticleTypes.GLOW_SQUID_INK;
diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
index 2b7eeb5659b1083ef550eb9feb0b7ba8a92a92e3..f8e080a943082a10fef3bd99c86ffe78aae8e0b4 100644
index b2e48e16bc944e6c5898f3d415e935c421243e16..f77609bcc20ac411ae5b0840645381301cee15f0 100644
--- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
+++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
@@ -220,9 +220,9 @@ public abstract class LivingEntity extends Entity {
@@ -262,7 +262,7 @@ index 2b7eeb5659b1083ef550eb9feb0b7ba8a92a92e3..f8e080a943082a10fef3bd99c86ffe78
// Paper end
if (!this.level.isClientSide && this.isSensitiveToWater() && this.isInWaterRainOrBubble()) {
diff --git a/src/main/java/net/minecraft/world/entity/Mob.java b/src/main/java/net/minecraft/world/entity/Mob.java
index 5eb93bacd303ebed0a702221f8ae31631d42f45d..c8dee3a9a5cafc9f0fd88becd843823836cd19b3 100644
index c73f3aa6dd75fe03c7e18180487d7bd6374b6339..4a3b6eac2c32cd2b69eb81f60ed55cd051412903 100644
--- a/src/main/java/net/minecraft/world/entity/Mob.java
+++ b/src/main/java/net/minecraft/world/entity/Mob.java
@@ -140,6 +140,8 @@ public abstract class Mob extends LivingEntity {
@@ -5752,7 +5752,7 @@ index 8ce49478441e77cedf5148ecb81d78b32660329e..fb5cd6fe7903f3f96af1abb55832bafb
+ // 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 622a0f23db838b839f76722df0e5480ec927b4a2..98e0c1e64d23552b8e8de5e17cee09fc0cb08d5c 100644
index db6c0917824b9127abd9f9250dc195a9f1d56f4f..89ad1c69456fb4aaf2ab8742c76343b30b74ecd0 100644
--- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
+++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
@@ -537,6 +537,15 @@ public class CraftEventFactory {
@@ -5771,7 +5771,7 @@ index 622a0f23db838b839f76722df0e5480ec927b4a2..98e0c1e64d23552b8e8de5e17cee09fc
return event;
}
@@ -959,6 +968,7 @@ public class CraftEventFactory {
@@ -960,6 +969,7 @@ public class CraftEventFactory {
damageCause = DamageCause.ENTITY_EXPLOSION;
}
event = new EntityDamageByEntityEvent(damager.getBukkitEntity(), entity.getBukkitEntity(), damageCause, modifiers, modifierFunctions);
@@ -5779,7 +5779,7 @@ index 622a0f23db838b839f76722df0e5480ec927b4a2..98e0c1e64d23552b8e8de5e17cee09fc
}
event.setCancelled(cancelled);
@@ -1046,6 +1056,7 @@ public class CraftEventFactory {
@@ -1045,6 +1055,7 @@ public class CraftEventFactory {
if (!event.isCancelled()) {
event.getEntity().setLastDamageCause(event);
}
@@ -5787,7 +5787,7 @@ index 622a0f23db838b839f76722df0e5480ec927b4a2..98e0c1e64d23552b8e8de5e17cee09fc
return event;
}
@@ -1097,6 +1108,7 @@ public class CraftEventFactory {
@@ -1096,6 +1107,7 @@ public class CraftEventFactory {
EntityDamageEvent event;
if (damager != null) {
event = new EntityDamageByEntityEvent(damager.getBukkitEntity(), damagee.getBukkitEntity(), cause, modifiers, modifierFunctions);