mirror of
https://github.com/PurpurMC/Purpur.git
synced 2026-02-17 16:37:43 +01:00
Updated Upstream (Paper)
Upstream has released updates that appear to apply and compile correctly Paper Changes: PaperMC/Paper@c95bc5f Don't unpack loot table for TEs not in world (#9918) PaperMC/Paper@6675d13 Fix strikeLightningEffect powers lightning rods & clears copper (#9780) PaperMC/Paper@63e77b5 Add Enchantment cost API (#9856) PaperMC/Paper@d8847bc Updated Upstream (Bukkit/CraftBukkit) (#9922) PaperMC/Paper@dd47ec6 Add Entity Movement Direction API (#7085) PaperMC/Paper@9ee60ec Add aggressive mob API (#9838) PaperMC/Paper@531ef27 Use ApiStatus.Internal instead of Deprecated (#9042) PaperMC/Paper@9548629 Add hand to fish event for all player interactions (#9929) PaperMC/Paper@aee3830 Deprecate Material#isInteractable (#9216) PaperMC/Paper@a506b48 Fix several issues with EntityBreedEvent (#8677) PaperMC/Paper@f186318 Run the chat callback on the main thread as expected (#9935)
This commit is contained in:
granny
@@ -66,10 +66,10 @@ index 85331b9b9edf4af02029333a628971fcf959090d..03ef82e835a82d6f42376881a3e5c83d
|
||||
|
||||
public void doTick() {
|
||||
diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
|
||||
index 2061f374a2b40ff5ba3e3bdb6ef02bbec3be9748..4b9fde27189a1436e4faea35f3f0f8c276c12e9c 100644
|
||||
index 6cc9271ba058f4af759eae34e2f6e9f892b4f6da..925ecb3d737f2e0e58bfdf17e2e48334188dce28 100644
|
||||
--- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
|
||||
+++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
|
||||
@@ -2713,6 +2713,8 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
|
||||
@@ -2714,6 +2714,8 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
|
||||
|
||||
ServerGamePacketListenerImpl.this.cserver.getPluginManager().callEvent(event);
|
||||
|
||||
@@ -79,7 +79,7 @@ index 2061f374a2b40ff5ba3e3bdb6ef02bbec3be9748..4b9fde27189a1436e4faea35f3f0f8c2
|
||||
if ((entity instanceof Bucketable && entity instanceof LivingEntity && origItem != null && origItem.asItem() == Items.WATER_BUCKET) && (event.isCancelled() || ServerGamePacketListenerImpl.this.player.getInventory().getSelected() == null || ServerGamePacketListenerImpl.this.player.getInventory().getSelected().getItem() != origItem)) {
|
||||
entity.getEntityData().resendPossiblyDesyncedEntity(player); // Paper - The entire mob gets deleted, so resend it.
|
||||
diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
|
||||
index 3dde7e4a063863d6b785f41aa4f29590ed8d9a9b..de2a1621b2d671de8f1c10463661cb361cd9e6b4 100644
|
||||
index d8568d4c6dd74b76f3d8444a2ab6f10b0cec6818..9501683d6a6239e7a053f9a40a377783232bbe8e 100644
|
||||
--- a/src/main/java/net/minecraft/world/entity/Entity.java
|
||||
+++ b/src/main/java/net/minecraft/world/entity/Entity.java
|
||||
@@ -376,7 +376,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
|
||||
@@ -1340,7 +1340,7 @@ index 4300fab61765dd224fab084d118aae7294fc9de6..66f80ec010909648278c4e74c80d3766
|
||||
this.targetSelector.addGoal(1, new NearestAttackableTargetGoal<>(this, Turtle.class, 10, false, false, Turtle.BABY_ON_LAND_SELECTOR));
|
||||
}
|
||||
diff --git a/src/main/java/net/minecraft/world/entity/animal/Panda.java b/src/main/java/net/minecraft/world/entity/animal/Panda.java
|
||||
index 683cc5f9f066d554383fcd30e3654ac06ec76510..5b3a2010da3b6429da783f8263fd170a4fb8d80b 100644
|
||||
index 17e42c49fe6f1696a0b0b4b2537cabfe565692e5..61af090813936bac334a487c21e9e67f80a4c413 100644
|
||||
--- a/src/main/java/net/minecraft/world/entity/animal/Panda.java
|
||||
+++ b/src/main/java/net/minecraft/world/entity/animal/Panda.java
|
||||
@@ -114,6 +114,32 @@ public class Panda extends Animal {
|
||||
@@ -1401,8 +1401,8 @@ index 683cc5f9f066d554383fcd30e3654ac06ec76510..5b3a2010da3b6429da783f8263fd170a
|
||||
} else if (this.isOnBack()) {
|
||||
this.setOnBack(false);
|
||||
return InteractionResult.sidedSuccess(this.level().isClientSide);
|
||||
@@ -653,7 +681,7 @@ public class Panda extends Animal {
|
||||
this.setInLove(player);
|
||||
@@ -654,7 +682,7 @@ public class Panda extends Animal {
|
||||
this.setInLove(player, breedCopy); // Paper
|
||||
} else {
|
||||
if (this.level().isClientSide || this.isSitting() || this.isInWater()) {
|
||||
- return InteractionResult.PASS;
|
||||
@@ -1410,7 +1410,7 @@ index 683cc5f9f066d554383fcd30e3654ac06ec76510..5b3a2010da3b6429da783f8263fd170a
|
||||
}
|
||||
|
||||
this.tryToSit();
|
||||
@@ -672,7 +700,7 @@ public class Panda extends Animal {
|
||||
@@ -673,7 +701,7 @@ public class Panda extends Animal {
|
||||
|
||||
return InteractionResult.SUCCESS;
|
||||
} else {
|
||||
@@ -1419,7 +1419,7 @@ index 683cc5f9f066d554383fcd30e3654ac06ec76510..5b3a2010da3b6429da783f8263fd170a
|
||||
}
|
||||
}
|
||||
|
||||
@@ -717,7 +745,7 @@ public class Panda extends Animal {
|
||||
@@ -718,7 +746,7 @@ public class Panda extends Animal {
|
||||
return new Vector3f(0.0F, dimensions.height - (this.isBaby() ? 0.4375F : 0.0F) * scaleFactor, 0.0F);
|
||||
}
|
||||
|
||||
@@ -1428,7 +1428,7 @@ index 683cc5f9f066d554383fcd30e3654ac06ec76510..5b3a2010da3b6429da783f8263fd170a
|
||||
|
||||
private final Panda panda;
|
||||
|
||||
@@ -727,9 +755,9 @@ public class Panda extends Animal {
|
||||
@@ -728,9 +756,9 @@ public class Panda extends Animal {
|
||||
}
|
||||
|
||||
@Override
|
||||
@@ -2277,7 +2277,7 @@ index b4793b88688bd568a428aa520e880f0038de45a7..d1dd2cda473bb2294dc10c66c13eac85
|
||||
|
||||
}
|
||||
diff --git a/src/main/java/net/minecraft/world/entity/animal/camel/Camel.java b/src/main/java/net/minecraft/world/entity/animal/camel/Camel.java
|
||||
index 1d9427da270edb447a2c8e031c4f05fe5d39603b..29108c481756d3150fd0ae69f6d249d127b11fdd 100644
|
||||
index 7dee2d1c4ce038f42334120f5dedb836f4e21723..02d19eaa4599951dd8a8fe594946c8a3dc5b30a9 100644
|
||||
--- a/src/main/java/net/minecraft/world/entity/animal/camel/Camel.java
|
||||
+++ b/src/main/java/net/minecraft/world/entity/animal/camel/Camel.java
|
||||
@@ -86,6 +86,13 @@ public class Camel extends AbstractHorse implements PlayerRideableJumping, Saddl
|
||||
@@ -2486,7 +2486,7 @@ index ff12ba2b79cb2e7e0bfd0e3b58ff6cb9e770092b..fef3b7d193d20c4fdd50b38c6a0371f0
|
||||
this.level().getProfiler().pop();
|
||||
this.level().getProfiler().push("goatActivityUpdate");
|
||||
diff --git a/src/main/java/net/minecraft/world/entity/animal/horse/AbstractHorse.java b/src/main/java/net/minecraft/world/entity/animal/horse/AbstractHorse.java
|
||||
index 09e9c0e55c789f03a4b64136f28154bd114db6f5..27050c00ea4e4b301d4c85528117fc1d87e6f1ef 100644
|
||||
index a0628b9d74c29d02bfba583edf7ee6f2cde2cff6..73db73bb5b47f586ce32249458268e4b7cda2003 100644
|
||||
--- a/src/main/java/net/minecraft/world/entity/animal/horse/AbstractHorse.java
|
||||
+++ b/src/main/java/net/minecraft/world/entity/animal/horse/AbstractHorse.java
|
||||
@@ -149,12 +149,22 @@ public abstract class AbstractHorse extends Animal implements ContainerListener,
|
||||
@@ -2557,7 +2557,7 @@ index 5f5dc651d570989ec1294c31a14dcfede466b80a..3e50581033e88e8eddcbd85bfa890cbe
|
||||
protected void randomizeAttributes(RandomSource random) {
|
||||
this.getAttribute(Attributes.MAX_HEALTH).setBaseValue((double)generateMaxHealth(random::nextInt));
|
||||
diff --git a/src/main/java/net/minecraft/world/entity/animal/horse/Llama.java b/src/main/java/net/minecraft/world/entity/animal/horse/Llama.java
|
||||
index 5f61c97478f005aaaaad1b027118079db7275cf7..0549974c56ae7d05b5eec77029c5d08a6614a8bf 100644
|
||||
index 9120663b63fc0e365e8edb359892b0db1ee97875..cd11879b8ad7977ca9c0c26d9bcc26ac7078a265 100644
|
||||
--- a/src/main/java/net/minecraft/world/entity/animal/horse/Llama.java
|
||||
+++ b/src/main/java/net/minecraft/world/entity/animal/horse/Llama.java
|
||||
@@ -78,7 +78,51 @@ public class Llama extends AbstractChestedHorse implements VariantHolder<Llama.V
|
||||
@@ -5191,7 +5191,7 @@ index 06d1bdb9bd124b201c36d284c50d22bf50d3735a..937f57d8af629c4e913d7ccabf6adab1
|
||||
public boolean isPickable() {
|
||||
return false;
|
||||
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
|
||||
index 90b04377088fcaf128cb35843702d2f5ead4b7f6..822faeca49c02562640f135948fab75a0bc49f0a 100644
|
||||
index 0e6c7284b9aee6c5f2454a3a095ebf349f887740..88e226431bd84747b9fadd68f273432a9efd766e 100644
|
||||
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
|
||||
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
|
||||
@@ -1527,4 +1527,27 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
|
||||
@@ -5223,10 +5223,10 @@ index 90b04377088fcaf128cb35843702d2f5ead4b7f6..822faeca49c02562640f135948fab75a
|
||||
+ // 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 249e3f703ef1b40b5401f167d4c30faafb69bb5b..70cb5d2aec1ad1cb071860e7a02f42f1ff0c1716 100644
|
||||
index 5dc160b743534665c6b3efb10b10f7c36e2da5ab..f33d6e9785acbd21a0b366587aa170cc1509bf58 100644
|
||||
--- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
|
||||
+++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
|
||||
@@ -592,6 +592,15 @@ public class CraftEventFactory {
|
||||
@@ -594,6 +594,15 @@ public class CraftEventFactory {
|
||||
// Paper end
|
||||
craftServer.getPluginManager().callEvent(event);
|
||||
|
||||
@@ -5242,7 +5242,7 @@ index 249e3f703ef1b40b5401f167d4c30faafb69bb5b..70cb5d2aec1ad1cb071860e7a02f42f1
|
||||
return event;
|
||||
}
|
||||
|
||||
@@ -1059,6 +1068,7 @@ public class CraftEventFactory {
|
||||
@@ -1061,6 +1070,7 @@ public class CraftEventFactory {
|
||||
damageCause = DamageCause.ENTITY_EXPLOSION;
|
||||
}
|
||||
event = new EntityDamageByEntityEvent(damager.getBukkitEntity(), entity.getBukkitEntity(), damageCause, modifiers, modifierFunctions, source.isCritical()); // Paper - add critical damage API
|
||||
@@ -5250,7 +5250,7 @@ index 249e3f703ef1b40b5401f167d4c30faafb69bb5b..70cb5d2aec1ad1cb071860e7a02f42f1
|
||||
}
|
||||
event.setCancelled(cancelled);
|
||||
|
||||
@@ -1173,6 +1183,7 @@ public class CraftEventFactory {
|
||||
@@ -1175,6 +1185,7 @@ public class CraftEventFactory {
|
||||
} else {
|
||||
entity.lastDamageCancelled = true; // SPIGOT-5339, SPIGOT-6252, SPIGOT-6777: Keep track if the event was canceled
|
||||
}
|
||||
@@ -5258,7 +5258,7 @@ index 249e3f703ef1b40b5401f167d4c30faafb69bb5b..70cb5d2aec1ad1cb071860e7a02f42f1
|
||||
return event;
|
||||
}
|
||||
|
||||
@@ -1236,6 +1247,7 @@ public class CraftEventFactory {
|
||||
@@ -1238,6 +1249,7 @@ public class CraftEventFactory {
|
||||
EntityDamageEvent event;
|
||||
if (damager != null) {
|
||||
event = new EntityDamageByEntityEvent(damager.getBukkitEntity(), damagee.getBukkitEntity(), cause, modifiers, modifierFunctions, critical); // Paper - add critical damage API
|
||||
|
||||
Reference in New Issue
Block a user