Mirrors/Paper
3
0
Fork 1
Mirror von https://github.com/PaperMC/Paper.git synchronisiert 2024-11-15 12:30:06 +01:00
Code Issues Projekte Releases Wiki Aktivität
24fed5a3a5
Paper/Spigot-Server-Patches/0401-force-entity-dismount-during-teleportation.patch

135 Zeilen
6.1 KiB
Diff
Originalformat Normale Ansicht Verlauf

Update upstream B/CB/S Also fixes build as a result of an upstream force push --- work/Bukkit Submodule work/Bukkit 217dc08d..d13fdf8c: > SPIGOT-4637: Add source block to BlockPhysicsEvent. --- work/CraftBukkit Submodule work/CraftBukkit acbba8ba..cb98c6ea: > Fix line endings in CraftDefaultPermissions > SPIGOT-4637: Add source block to BlockPhysicsEvent. --- work/Spigot Submodule work/Spigot 75ee78a0c...4165cd8f4 (commits not present) > (Manually Added) - Appears to be a result of an upstream force push > (Manually Added) - Changed: SPIGOT-4636: Add creative mode NBT permissions
2019-02-25 10:39:24 +01:00
From 53d0acc26fc4de7b3c54f6d6afd00c169b14d201 Mon Sep 17 00:00:00 2001
force entity dismount during teleportation Entities must be dismounted before teleportation in order to avoid multiple issues in the server with regards to teleportation, while we now lose the ability for plugins to monitor this specific case of entity dismount, the alternative is that we allow a cancellable event, but silently ignore the cancelled status, which might cause further issues for plugins tracking state Given that nobody can be relying on the Cancellable state of those events during teleportation due to the issues that arise from this, this is a small trade off
2018-11-15 15:29:04 +01:00
From: Shane Freeder <theboyetronic@gmail.com>
Date: Thu, 15 Nov 2018 13:38:37 +0000
Subject: [PATCH] force entity dismount during teleportation
Entities must be dismounted before teleportation in order to avoid
Fire entity dismount/vehicle events (but supress their cancellation) for player teleportation Entities must be dismounted before teleportation in order to avoid multiple issues in the server with regards to teleportation, shamefully, too many plugins rely on the events firing, which means that not firing these events caues more issues than it solves; In order to counteract this, Entity dismount/exit vehicle events have been modified to supress cancellation (and has a method to allow plugins to check if this has been set), noting that cancellation will be silently surpressed given that plugins are not expecting this event to not be cancellable. This is a far from ideal scenario, however: given the current state of this event and other alternatives causing issues elsewhere, I believe that this is going to be the best soultion all around. Improvements/suggestions welcome!
2018-11-18 16:39:28 +01:00
multiple issues in the server with regards to teleportation, shamefully,
too many plugins rely on the events firing, which means that not firing
these events caues more issues than it solves;
force entity dismount during teleportation Entities must be dismounted before teleportation in order to avoid multiple issues in the server with regards to teleportation, while we now lose the ability for plugins to monitor this specific case of entity dismount, the alternative is that we allow a cancellable event, but silently ignore the cancelled status, which might cause further issues for plugins tracking state Given that nobody can be relying on the Cancellable state of those events during teleportation due to the issues that arise from this, this is a small trade off
2018-11-15 15:29:04 +01:00
Fire entity dismount/vehicle events (but supress their cancellation) for player teleportation Entities must be dismounted before teleportation in order to avoid multiple issues in the server with regards to teleportation, shamefully, too many plugins rely on the events firing, which means that not firing these events caues more issues than it solves; In order to counteract this, Entity dismount/exit vehicle events have been modified to supress cancellation (and has a method to allow plugins to check if this has been set), noting that cancellation will be silently surpressed given that plugins are not expecting this event to not be cancellable. This is a far from ideal scenario, however: given the current state of this event and other alternatives causing issues elsewhere, I believe that this is going to be the best soultion all around. Improvements/suggestions welcome!
2018-11-18 16:39:28 +01:00
In order to counteract this, Entity dismount/exit vehicle events have
been modified to supress cancellation (and has a method to allow plugins
to check if this has been set), noting that cancellation will be silently
surpressed given that plugins are not expecting this event to not be cancellable.
This is a far from ideal scenario, however: given the current state of this
event and other alternatives causing issues elsewhere, I believe that
this is going to be the best soultion all around.
Improvements/suggestions welcome!
force entity dismount during teleportation Entities must be dismounted before teleportation in order to avoid multiple issues in the server with regards to teleportation, while we now lose the ability for plugins to monitor this specific case of entity dismount, the alternative is that we allow a cancellable event, but silently ignore the cancelled status, which might cause further issues for plugins tracking state Given that nobody can be relying on the Cancellable state of those events during teleportation due to the issues that arise from this, this is a small trade off
2018-11-15 15:29:04 +01:00
diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
[Auto] Updated Upstream (CraftBukkit) Upstream has released updates that appears to apply and compile correctly. This update has not been tested by PaperMC and as with ANY update, please do your own testing CraftBukkit Changes: acbba8ba SPIGOT-4635: Restore shield damage sound
2019-02-25 08:56:39 +01:00
index e448f0893..88298680f 100644
force entity dismount during teleportation Entities must be dismounted before teleportation in order to avoid multiple issues in the server with regards to teleportation, while we now lose the ability for plugins to monitor this specific case of entity dismount, the alternative is that we allow a cancellable event, but silently ignore the cancelled status, which might cause further issues for plugins tracking state Given that nobody can be relying on the Cancellable state of those events during teleportation due to the issues that arise from this, this is a small trade off
2018-11-15 15:29:04 +01:00
--- a/src/main/java/net/minecraft/server/Entity.java
+++ b/src/main/java/net/minecraft/server/Entity.java
Updated Upstream (Bukkit/CraftBukkit) Upstream has released updates that appears to apply and compile correctly. This update has not been tested by PaperMC and as with ANY update, please do your own testing Bukkit Changes: 18cda936 Fix variant of unloadChunkRequest that was incorrectly never deprecated 00763e1b Deprecate some methods 35a83d54 SPIGOT-4572: Make default no permission message clearer 6163343d Fix some misplaced material enum entries 8736469c Fix typo in TechnicalPiston documentation CraftBukkit Changes: 0c715b32 SPIGOT-4579: Shulker boxes not dropping in creative 50fbc3f1 SPIGOT-4576: Fix attributes in itemstack internal data being lost 8059a937 SPIGOT-4577: Fix loss of int/double custom tags when serialized to yaml 07e504c3 Clarify exception thrown when setting drop chance for player inventory 98b862ad Fix duplicate iron golem add 843cee65 Fix a bunch of duplicate EntityCombustEvent calls 43855624 SPIGOT-4571: EntityCombustEvent not firing for phantoms
2019-01-15 22:12:19 +01:00
@@ -2110,12 +2110,15 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
force entity dismount during teleportation Entities must be dismounted before teleportation in order to avoid multiple issues in the server with regards to teleportation, while we now lose the ability for plugins to monitor this specific case of entity dismount, the alternative is that we allow a cancellable event, but silently ignore the cancelled status, which might cause further issues for plugins tracking state Given that nobody can be relying on the Cancellable state of those events during teleportation due to the issues that arise from this, this is a small trade off
2018-11-15 15:29:04 +01:00
}
- public void stopRiding() {
+ // Paper start
+ public void stopRiding() { stopRiding(false); }
Fire entity dismount/vehicle events (but supress their cancellation) for player teleportation Entities must be dismounted before teleportation in order to avoid multiple issues in the server with regards to teleportation, shamefully, too many plugins rely on the events firing, which means that not firing these events caues more issues than it solves; In order to counteract this, Entity dismount/exit vehicle events have been modified to supress cancellation (and has a method to allow plugins to check if this has been set), noting that cancellation will be silently surpressed given that plugins are not expecting this event to not be cancellable. This is a far from ideal scenario, however: given the current state of this event and other alternatives causing issues elsewhere, I believe that this is going to be the best soultion all around. Improvements/suggestions welcome!
2018-11-18 16:39:28 +01:00
+ public void stopRiding(boolean suppressCancellation) {
force entity dismount during teleportation Entities must be dismounted before teleportation in order to avoid multiple issues in the server with regards to teleportation, while we now lose the ability for plugins to monitor this specific case of entity dismount, the alternative is that we allow a cancellable event, but silently ignore the cancelled status, which might cause further issues for plugins tracking state Given that nobody can be relying on the Cancellable state of those events during teleportation due to the issues that arise from this, this is a small trade off
2018-11-15 15:29:04 +01:00
+ // Paper end
if (this.vehicle != null) {
Entity entity = this.vehicle;
this.vehicle = null;
- if (!entity.removePassenger(this)) this.vehicle = entity; // CraftBukkit
Fire entity dismount/vehicle events (but supress their cancellation) for player teleportation Entities must be dismounted before teleportation in order to avoid multiple issues in the server with regards to teleportation, shamefully, too many plugins rely on the events firing, which means that not firing these events caues more issues than it solves; In order to counteract this, Entity dismount/exit vehicle events have been modified to supress cancellation (and has a method to allow plugins to check if this has been set), noting that cancellation will be silently surpressed given that plugins are not expecting this event to not be cancellable. This is a far from ideal scenario, however: given the current state of this event and other alternatives causing issues elsewhere, I believe that this is going to be the best soultion all around. Improvements/suggestions welcome!
2018-11-18 16:39:28 +01:00
+ if (!entity.removePassenger(this, suppressCancellation)) this.vehicle = entity; // CraftBukkit // Paper
force entity dismount during teleportation Entities must be dismounted before teleportation in order to avoid multiple issues in the server with regards to teleportation, while we now lose the ability for plugins to monitor this specific case of entity dismount, the alternative is that we allow a cancellable event, but silently ignore the cancelled status, which might cause further issues for plugins tracking state Given that nobody can be relying on the Cancellable state of those events during teleportation due to the issues that arise from this, this is a small trade off
2018-11-15 15:29:04 +01:00
}
}
Updated Upstream (Bukkit/CraftBukkit) Upstream has released updates that appears to apply and compile correctly. This update has not been tested by PaperMC and as with ANY update, please do your own testing Bukkit Changes: 18cda936 Fix variant of unloadChunkRequest that was incorrectly never deprecated 00763e1b Deprecate some methods 35a83d54 SPIGOT-4572: Make default no permission message clearer 6163343d Fix some misplaced material enum entries 8736469c Fix typo in TechnicalPiston documentation CraftBukkit Changes: 0c715b32 SPIGOT-4579: Shulker boxes not dropping in creative 50fbc3f1 SPIGOT-4576: Fix attributes in itemstack internal data being lost 8059a937 SPIGOT-4577: Fix loss of int/double custom tags when serialized to yaml 07e504c3 Clarify exception thrown when setting drop chance for player inventory 98b862ad Fix duplicate iron golem add 843cee65 Fix a bunch of duplicate EntityCombustEvent calls 43855624 SPIGOT-4571: EntityCombustEvent not firing for phantoms
2019-01-15 22:12:19 +01:00
@@ -2160,7 +2163,10 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
force entity dismount during teleportation Entities must be dismounted before teleportation in order to avoid multiple issues in the server with regards to teleportation, while we now lose the ability for plugins to monitor this specific case of entity dismount, the alternative is that we allow a cancellable event, but silently ignore the cancelled status, which might cause further issues for plugins tracking state Given that nobody can be relying on the Cancellable state of those events during teleportation due to the issues that arise from this, this is a small trade off
2018-11-15 15:29:04 +01:00
return true; // CraftBukkit
}
- protected boolean removePassenger(Entity entity) { // CraftBukkit
+ // Paper start
+ protected boolean removePassenger(Entity entity) { return removePassenger(entity, false);}
Fire entity dismount/vehicle events (but supress their cancellation) for player teleportation Entities must be dismounted before teleportation in order to avoid multiple issues in the server with regards to teleportation, shamefully, too many plugins rely on the events firing, which means that not firing these events caues more issues than it solves; In order to counteract this, Entity dismount/exit vehicle events have been modified to supress cancellation (and has a method to allow plugins to check if this has been set), noting that cancellation will be silently surpressed given that plugins are not expecting this event to not be cancellable. This is a far from ideal scenario, however: given the current state of this event and other alternatives causing issues elsewhere, I believe that this is going to be the best soultion all around. Improvements/suggestions welcome!
2018-11-18 16:39:28 +01:00
+ protected boolean removePassenger(Entity entity, boolean suppressCancellation) { // CraftBukkit
force entity dismount during teleportation Entities must be dismounted before teleportation in order to avoid multiple issues in the server with regards to teleportation, while we now lose the ability for plugins to monitor this specific case of entity dismount, the alternative is that we allow a cancellable event, but silently ignore the cancelled status, which might cause further issues for plugins tracking state Given that nobody can be relying on the Cancellable state of those events during teleportation due to the issues that arise from this, this is a small trade off
2018-11-15 15:29:04 +01:00
+ // Paper end
if (entity.getVehicle() == this) {
throw new IllegalStateException("Use x.stopRiding(y), not y.removePassenger(x)");
} else {
Updated Upstream (Bukkit/CraftBukkit) Upstream has released updates that appears to apply and compile correctly. This update has not been tested by PaperMC and as with ANY update, please do your own testing Bukkit Changes: 18cda936 Fix variant of unloadChunkRequest that was incorrectly never deprecated 00763e1b Deprecate some methods 35a83d54 SPIGOT-4572: Make default no permission message clearer 6163343d Fix some misplaced material enum entries 8736469c Fix typo in TechnicalPiston documentation CraftBukkit Changes: 0c715b32 SPIGOT-4579: Shulker boxes not dropping in creative 50fbc3f1 SPIGOT-4576: Fix attributes in itemstack internal data being lost 8059a937 SPIGOT-4577: Fix loss of int/double custom tags when serialized to yaml 07e504c3 Clarify exception thrown when setting drop chance for player inventory 98b862ad Fix duplicate iron golem add 843cee65 Fix a bunch of duplicate EntityCombustEvent calls 43855624 SPIGOT-4571: EntityCombustEvent not firing for phantoms
2019-01-15 22:12:19 +01:00
@@ -2170,7 +2176,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
Fire entity dismount/vehicle events (but supress their cancellation) for player teleportation Entities must be dismounted before teleportation in order to avoid multiple issues in the server with regards to teleportation, shamefully, too many plugins rely on the events firing, which means that not firing these events caues more issues than it solves; In order to counteract this, Entity dismount/exit vehicle events have been modified to supress cancellation (and has a method to allow plugins to check if this has been set), noting that cancellation will be silently surpressed given that plugins are not expecting this event to not be cancellable. This is a far from ideal scenario, however: given the current state of this event and other alternatives causing issues elsewhere, I believe that this is going to be the best soultion all around. Improvements/suggestions welcome!
2018-11-18 16:39:28 +01:00
if (getBukkitEntity() instanceof Vehicle && entity.getBukkitEntity() instanceof LivingEntity) {
VehicleExitEvent event = new VehicleExitEvent(
(Vehicle) getBukkitEntity(),
- (LivingEntity) entity.getBukkitEntity()
+ (LivingEntity) entity.getBukkitEntity(), !suppressCancellation // Paper
);
Bukkit.getPluginManager().callEvent(event);
CraftEntity craftn = (CraftEntity) entity.getBukkitEntity().getVehicle();
Updated Upstream (Bukkit/CraftBukkit) Upstream has released updates that appears to apply and compile correctly. This update has not been tested by PaperMC and as with ANY update, please do your own testing Bukkit Changes: 18cda936 Fix variant of unloadChunkRequest that was incorrectly never deprecated 00763e1b Deprecate some methods 35a83d54 SPIGOT-4572: Make default no permission message clearer 6163343d Fix some misplaced material enum entries 8736469c Fix typo in TechnicalPiston documentation CraftBukkit Changes: 0c715b32 SPIGOT-4579: Shulker boxes not dropping in creative 50fbc3f1 SPIGOT-4576: Fix attributes in itemstack internal data being lost 8059a937 SPIGOT-4577: Fix loss of int/double custom tags when serialized to yaml 07e504c3 Clarify exception thrown when setting drop chance for player inventory 98b862ad Fix duplicate iron golem add 843cee65 Fix a bunch of duplicate EntityCombustEvent calls 43855624 SPIGOT-4571: EntityCombustEvent not firing for phantoms
2019-01-15 22:12:19 +01:00
@@ -2181,7 +2187,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
Fire entity dismount/vehicle events (but supress their cancellation) for player teleportation Entities must be dismounted before teleportation in order to avoid multiple issues in the server with regards to teleportation, shamefully, too many plugins rely on the events firing, which means that not firing these events caues more issues than it solves; In order to counteract this, Entity dismount/exit vehicle events have been modified to supress cancellation (and has a method to allow plugins to check if this has been set), noting that cancellation will be silently surpressed given that plugins are not expecting this event to not be cancellable. This is a far from ideal scenario, however: given the current state of this event and other alternatives causing issues elsewhere, I believe that this is going to be the best soultion all around. Improvements/suggestions welcome!
2018-11-18 16:39:28 +01:00
}
// CraftBukkit end
// Spigot start
- org.spigotmc.event.entity.EntityDismountEvent event = new org.spigotmc.event.entity.EntityDismountEvent(entity.getBukkitEntity(), this.getBukkitEntity());
+ org.spigotmc.event.entity.EntityDismountEvent event = new org.spigotmc.event.entity.EntityDismountEvent(entity.getBukkitEntity(), this.getBukkitEntity(), !suppressCancellation); // Paper
Bukkit.getPluginManager().callEvent(event);
force entity dismount during teleportation Entities must be dismounted before teleportation in order to avoid multiple issues in the server with regards to teleportation, while we now lose the ability for plugins to monitor this specific case of entity dismount, the alternative is that we allow a cancellable event, but silently ignore the cancelled status, which might cause further issues for plugins tracking state Given that nobody can be relying on the Cancellable state of those events during teleportation due to the issues that arise from this, this is a small trade off
2018-11-15 15:29:04 +01:00
if (event.isCancelled()) {
return false;
Ensure stopRiding override follows all super calls Fixes GH-1702
2018-11-28 05:18:34 +01:00
diff --git a/src/main/java/net/minecraft/server/EntityHuman.java b/src/main/java/net/minecraft/server/EntityHuman.java
[Auto] Updated Upstream (CraftBukkit) Upstream has released updates that appears to apply and compile correctly. This update has not been tested by PaperMC and as with ANY update, please do your own testing CraftBukkit Changes: acbba8ba SPIGOT-4635: Restore shield damage sound
2019-02-25 08:56:39 +01:00
index 82684dd68..dab958a04 100644
Ensure stopRiding override follows all super calls Fixes GH-1702
2018-11-28 05:18:34 +01:00
--- a/src/main/java/net/minecraft/server/EntityHuman.java
+++ b/src/main/java/net/minecraft/server/EntityHuman.java
Updated Upstream (Bukkit/CraftBukkit/Spigot) Upstream has released updates that appears to apply and compile correctly. This update has not been tested by PaperMC and as with ANY update, please do your own testing Warning: this commit contains more mapping changes from upstream, As always, ensure that you have working backups and test this build before deployment; Developers working on paper will, yet again, need to delete their work/Minecraft/1.13.2 folder Bukkit Changes: 7fca5fd4 SPIGOT-4558: Preserve user order in the face of copied defaults in configurations 15c9b1eb Ignore spurious slot IDs sent by client, e.g. in enchanting tables 5d2a10c5 SPIGOT-3747: Add API for force loaded chunks d6dd2bb3 SPIGOT-3538: Add getHitBlockFace for ProjectileHitEvent 771db4aa SPIGOT-794: Call EntityPlaceEvent for Minecart placement 55462509 Add InventoryView#getSlotType 2f3ce5b6 Remove EntityTransformEvent and CustomItemTagContainer from draft API f04ad7b6 Make ProjectileLaunchEvent extend EntitySpawnEvent ccb85808 Define EntitySpawnEvent b8cc3ebe Add PlayerItemDamageEvent 184a495d Ease ClassLoader Deadlocks Where Possible 11ac4728 Expand Boolean Prompt Values in Conversation API aae62d51 Added getAllSessionData() to the Conversation API. 9290ff91 Add InventoryView#getInventory API 995e530f Add API to get / set base arrow damage CraftBukkit Changes: c4a67eed SPIGOT-4556: Fix plugins closing inventory during drop events 5be2ddcb Replace version constants with methods to prevent compiler inlining a5b9c7b3 Use API method to create offset command completions 2bc7d1df SPIGOT-3747: Add API for force loaded chunks a408f375 SPIGOT-3538: Add getHitBlockFace for ProjectileHitEvent b54b9409 SPIGOT-2864: Make Arrow / Item setTicksLived behave like FallingBlock 79ded7a8 SPIGOT-1811: Death message not shown on respawn screen b4a4f15d SPIGOT-943: InventoryCloseEvent called on death regardless of open inventory 0afed592 SPIGOT-794: Call EntityPlaceEvent for Minecart placement 2b2d084a Add InventoryView#getSlotType 01a9959a Do not use deprecated ItemSpawnEvent constructor 9642498d SPIGOT-4547: Call EntitySpawnEvent as general spawn fallback event 963f4a5f Add PlayerItemDamageEvent 63db0445 Add API to get / set base arrow damage 531c25d7 Add CraftMagicNumbers.MAPPINGS_VERSION for use by NMS plugins d05c8b14 Mappings Update bd36e200 SPIGOT-4551: Ignore invalid attribute modifier slots Spigot Changes: 518206a1 Remove redundant trove depend 1959ad21 MC-11211,SPIGOT-4552: Fix placing double slabs at y = 255 29ab5e43 SPIGOT-3661: Allow arguments in restart-script 7cc46316 SPIGOT-852: Growth modifiers for beetroots, potatoes, carrots 82e117e1 Squelch "fatal: Resolve operation not in progress" message 0a1a68e7 Mappings Update & Patch Rebuild
2019-01-01 04:15:55 +01:00
@@ -991,8 +991,11 @@ public abstract class EntityHuman extends EntityLiving {
Ensure stopRiding override follows all super calls Fixes GH-1702
2018-11-28 05:18:34 +01:00
return -0.35D;
}
- public void stopRiding() {
- super.stopRiding();
+ // Paper start
+ public void stopRiding() { stopRiding(false); }
+ public void stopRiding(boolean suppressCancellation) {
+ // Paper end
+ super.stopRiding(suppressCancellation); // Paper - suppress
this.k = 0;
}
diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
[Auto] Updated Upstream (CraftBukkit) Upstream has released updates that appears to apply and compile correctly. This update has not been tested by PaperMC and as with ANY update, please do your own testing CraftBukkit Changes: acbba8ba SPIGOT-4635: Restore shield damage sound
2019-02-25 08:56:39 +01:00
index 9815509c4..b1d86c8e9 100644
Ensure stopRiding override follows all super calls Fixes GH-1702
2018-11-28 05:18:34 +01:00
--- a/src/main/java/net/minecraft/server/EntityLiving.java
+++ b/src/main/java/net/minecraft/server/EntityLiving.java
[Auto] Updated Upstream (CraftBukkit) Upstream has released updates that appears to apply and compile correctly. This update has not been tested by PaperMC and as with ANY update, please do your own testing CraftBukkit Changes: acbba8ba SPIGOT-4635: Restore shield damage sound
2019-02-25 08:56:39 +01:00
@@ -2479,10 +2479,13 @@ public abstract class EntityLiving extends Entity {
Update upstream BD/B/CB/S Note to other developers: This commit may require you to wipe your workspace as a result of the changes to BD. --- work/BuildData Submodule work/BuildData f527a8ff..d56672db: > Mappings Update --- work/Bukkit Submodule work/Bukkit 0c1d258bb..db06c80d7: > Add list of entities to EntityTransformEvent > SPIGOT-4347: Add API to allow storing arbitrary values on ItemStacks ---work/CraftBukkit Submodule work/CraftBukkit 6a398ac44..068dab5be: > Enable optional source JAR shading via profile shadeSourcesJar > Use ImmutableList rather than AbstractList for CraftMetaBook > Fix setRecipes(List) not setting Knowledge Book recipes. > Mappings Update > Add list of entities to EntityTransformEvent & move die calls > SPIGOT-4347: Add API to allow storing arbitrary values on ItemStacks > Add Vanilla help to default permissions --- work/Spigot Submodule work/Spigot a1f2566f6..e769fe4d9: > Mappings Update > Rebuild patches
2018-12-08 11:09:55 +01:00
return ((Byte) this.datawatcher.get(EntityLiving.aw) & 4) != 0;
Ensure stopRiding override follows all super calls Fixes GH-1702
2018-11-28 05:18:34 +01:00
}
- public void stopRiding() {
+ // Paper start
+ public void stopRiding() { stopRiding(false); }
+ public void stopRiding(boolean suppressCancellation) {
+ // Paper end
Entity entity = this.getVehicle();
- super.stopRiding();
+ super.stopRiding(suppressCancellation); // Paper - suppress
if (entity != null && entity != this.getVehicle() && !this.world.isClientSide) {
this.A(entity);
}
force entity dismount during teleportation Entities must be dismounted before teleportation in order to avoid multiple issues in the server with regards to teleportation, while we now lose the ability for plugins to monitor this specific case of entity dismount, the alternative is that we allow a cancellable event, but silently ignore the cancelled status, which might cause further issues for plugins tracking state Given that nobody can be relying on the Cancellable state of those events during teleportation due to the issues that arise from this, this is a small trade off
2018-11-15 15:29:04 +01:00
diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
[Auto] Updated Upstream (CraftBukkit) Upstream has released updates that appears to apply and compile correctly. This update has not been tested by PaperMC and as with ANY update, please do your own testing CraftBukkit Changes: acbba8ba SPIGOT-4635: Restore shield damage sound
2019-02-25 08:56:39 +01:00
index 005bcaac1..0ea31156b 100644
force entity dismount during teleportation Entities must be dismounted before teleportation in order to avoid multiple issues in the server with regards to teleportation, while we now lose the ability for plugins to monitor this specific case of entity dismount, the alternative is that we allow a cancellable event, but silently ignore the cancelled status, which might cause further issues for plugins tracking state Given that nobody can be relying on the Cancellable state of those events during teleportation due to the issues that arise from this, this is a small trade off
2018-11-15 15:29:04 +01:00
--- a/src/main/java/net/minecraft/server/EntityPlayer.java
+++ b/src/main/java/net/minecraft/server/EntityPlayer.java
Updated Upstream (Bukkit/CraftBukkit/Spigot) Upstream has released updates that appears to apply and compile correctly. This update has not been tested by PaperMC and as with ANY update, please do your own testing Warning: this commit contains more mapping changes from upstream, As always, ensure that you have working backups and test this build before deployment; Developers working on paper will, yet again, need to delete their work/Minecraft/1.13.2 folder Bukkit Changes: 7fca5fd4 SPIGOT-4558: Preserve user order in the face of copied defaults in configurations 15c9b1eb Ignore spurious slot IDs sent by client, e.g. in enchanting tables 5d2a10c5 SPIGOT-3747: Add API for force loaded chunks d6dd2bb3 SPIGOT-3538: Add getHitBlockFace for ProjectileHitEvent 771db4aa SPIGOT-794: Call EntityPlaceEvent for Minecart placement 55462509 Add InventoryView#getSlotType 2f3ce5b6 Remove EntityTransformEvent and CustomItemTagContainer from draft API f04ad7b6 Make ProjectileLaunchEvent extend EntitySpawnEvent ccb85808 Define EntitySpawnEvent b8cc3ebe Add PlayerItemDamageEvent 184a495d Ease ClassLoader Deadlocks Where Possible 11ac4728 Expand Boolean Prompt Values in Conversation API aae62d51 Added getAllSessionData() to the Conversation API. 9290ff91 Add InventoryView#getInventory API 995e530f Add API to get / set base arrow damage CraftBukkit Changes: c4a67eed SPIGOT-4556: Fix plugins closing inventory during drop events 5be2ddcb Replace version constants with methods to prevent compiler inlining a5b9c7b3 Use API method to create offset command completions 2bc7d1df SPIGOT-3747: Add API for force loaded chunks a408f375 SPIGOT-3538: Add getHitBlockFace for ProjectileHitEvent b54b9409 SPIGOT-2864: Make Arrow / Item setTicksLived behave like FallingBlock 79ded7a8 SPIGOT-1811: Death message not shown on respawn screen b4a4f15d SPIGOT-943: InventoryCloseEvent called on death regardless of open inventory 0afed592 SPIGOT-794: Call EntityPlaceEvent for Minecart placement 2b2d084a Add InventoryView#getSlotType 01a9959a Do not use deprecated ItemSpawnEvent constructor 9642498d SPIGOT-4547: Call EntitySpawnEvent as general spawn fallback event 963f4a5f Add PlayerItemDamageEvent 63db0445 Add API to get / set base arrow damage 531c25d7 Add CraftMagicNumbers.MAPPINGS_VERSION for use by NMS plugins d05c8b14 Mappings Update bd36e200 SPIGOT-4551: Ignore invalid attribute modifier slots Spigot Changes: 518206a1 Remove redundant trove depend 1959ad21 MC-11211,SPIGOT-4552: Fix placing double slabs at y = 255 29ab5e43 SPIGOT-3661: Allow arguments in restart-script 7cc46316 SPIGOT-852: Growth modifiers for beetroots, potatoes, carrots 82e117e1 Squelch "fatal: Resolve operation not in progress" message 0a1a68e7 Mappings Update & Patch Rebuild
2019-01-01 04:15:55 +01:00
@@ -778,10 +778,13 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
force entity dismount during teleportation Entities must be dismounted before teleportation in order to avoid multiple issues in the server with regards to teleportation, while we now lose the ability for plugins to monitor this specific case of entity dismount, the alternative is that we allow a cancellable event, but silently ignore the cancelled status, which might cause further issues for plugins tracking state Given that nobody can be relying on the Cancellable state of those events during teleportation due to the issues that arise from this, this is a small trade off
2018-11-15 15:29:04 +01:00
}
}
- public void stopRiding() {
+ // Paper start
Ensure stopRiding override follows all super calls Fixes GH-1702
2018-11-28 05:18:34 +01:00
+ public void stopRiding() { stopRiding(false); }
Fire entity dismount/vehicle events (but supress their cancellation) for player teleportation Entities must be dismounted before teleportation in order to avoid multiple issues in the server with regards to teleportation, shamefully, too many plugins rely on the events firing, which means that not firing these events caues more issues than it solves; In order to counteract this, Entity dismount/exit vehicle events have been modified to supress cancellation (and has a method to allow plugins to check if this has been set), noting that cancellation will be silently surpressed given that plugins are not expecting this event to not be cancellable. This is a far from ideal scenario, however: given the current state of this event and other alternatives causing issues elsewhere, I believe that this is going to be the best soultion all around. Improvements/suggestions welcome!
2018-11-18 16:39:28 +01:00
+ public void stopRiding(boolean suppressCancellation) {
force entity dismount during teleportation Entities must be dismounted before teleportation in order to avoid multiple issues in the server with regards to teleportation, while we now lose the ability for plugins to monitor this specific case of entity dismount, the alternative is that we allow a cancellable event, but silently ignore the cancelled status, which might cause further issues for plugins tracking state Given that nobody can be relying on the Cancellable state of those events during teleportation due to the issues that arise from this, this is a small trade off
2018-11-15 15:29:04 +01:00
+ // paper end
Entity entity = this.getVehicle();
- super.stopRiding();
Fire entity dismount/vehicle events (but supress their cancellation) for player teleportation Entities must be dismounted before teleportation in order to avoid multiple issues in the server with regards to teleportation, shamefully, too many plugins rely on the events firing, which means that not firing these events caues more issues than it solves; In order to counteract this, Entity dismount/exit vehicle events have been modified to supress cancellation (and has a method to allow plugins to check if this has been set), noting that cancellation will be silently surpressed given that plugins are not expecting this event to not be cancellable. This is a far from ideal scenario, however: given the current state of this event and other alternatives causing issues elsewhere, I believe that this is going to be the best soultion all around. Improvements/suggestions welcome!
2018-11-18 16:39:28 +01:00
+ super.stopRiding(suppressCancellation); // Paper
force entity dismount during teleportation Entities must be dismounted before teleportation in order to avoid multiple issues in the server with regards to teleportation, while we now lose the ability for plugins to monitor this specific case of entity dismount, the alternative is that we allow a cancellable event, but silently ignore the cancelled status, which might cause further issues for plugins tracking state Given that nobody can be relying on the Cancellable state of those events during teleportation due to the issues that arise from this, this is a small trade off
2018-11-15 15:29:04 +01:00
Entity entity1 = this.getVehicle();
if (entity1 != entity && this.playerConnection != null) {
--
Remove "Don't double add golems to world" Fixed upstream
2019-01-17 03:02:56 +01:00
2.20.1
force entity dismount during teleportation Entities must be dismounted before teleportation in order to avoid multiple issues in the server with regards to teleportation, while we now lose the ability for plugins to monitor this specific case of entity dismount, the alternative is that we allow a cancellable event, but silently ignore the cancelled status, which might cause further issues for plugins tracking state Given that nobody can be relying on the Cancellable state of those events during teleportation due to the issues that arise from this, this is a small trade off
2018-11-15 15:29:04 +01:00
In neuem Issue referenzieren Permalink kopieren