diff options
| author | Nassim Jahnke <[email protected]> | 2021-07-07 08:52:40 +0200 |
|---|---|---|
| committer | GitHub <[email protected]> | 2021-07-07 06:52:40 +0000 |
| commit | 56fd1a2f841820cab40943e5697022f97912a85a (patch) | |
| tree | 85a784e70096fe64216962da0af86da4aa0ab205 /patches/server/0297-force-entity-dismount-during-teleportation.patch | |
| parent | a831634d446341efc70f027851effe02a0e7f1d3 (diff) | |
| download | Paper-56fd1a2f841820cab40943e5697022f97912a85a.tar.gz Paper-56fd1a2f841820cab40943e5697022f97912a85a.zip | |
Update to Minecraft 1.17.1 (#6097)
Diffstat (limited to 'patches/server/0297-force-entity-dismount-during-teleportation.patch')
| -rw-r--r-- | patches/server/0297-force-entity-dismount-during-teleportation.patch | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/patches/server/0297-force-entity-dismount-during-teleportation.patch b/patches/server/0297-force-entity-dismount-during-teleportation.patch index f664096774..67e5c3d72e 100644 --- a/patches/server/0297-force-entity-dismount-during-teleportation.patch +++ b/patches/server/0297-force-entity-dismount-during-teleportation.patch @@ -20,10 +20,10 @@ this is going to be the best soultion all around. Improvements/suggestions welcome! diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java -index 8e896afe43307a46ad8375ff8b35b107d2524502..eb70747ec90770752a45ddf28cf207e2281d3a37 100644 +index 635aa1cf7343a242fb01a49f2215d2af25a09760..efb759fe76540b51509029d40884eb85a31cda86 100644 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java -@@ -1299,11 +1299,13 @@ public class ServerPlayer extends Player { +@@ -1295,11 +1295,13 @@ public class ServerPlayer extends Player { } } @@ -41,7 +41,7 @@ index 8e896afe43307a46ad8375ff8b35b107d2524502..eb70747ec90770752a45ddf28cf207e2 if (entity1 != entity && this.connection != null) { diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java -index ca03f791a44cc3c44f42c705fb1715826eefa664..3518044845ec400ff6c2ddf7fc7dc32f1f7769b6 100644 +index 35f83b559002886b8728297eb9fecc7588bdc950..dbf002a6967812fd58ed9bcfa615dc525586c1a0 100644 --- a/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java @@ -2239,12 +2239,15 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, n @@ -93,10 +93,10 @@ index ca03f791a44cc3c44f42c705fb1715826eefa664..3518044845ec400ff6c2ddf7fc7dc32f if (this.valid) { Bukkit.getPluginManager().callEvent(event); diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java -index 5e781d0af08ba7faba84ee774e87f1c0d484ae9f..4e366fd032cf0ac37a7a851994625b905029cd4a 100644 +index af2ab0847127c1c1c7024570fbb9a23ef33fc80a..330d72b8851e3a9fb9988117f908c561ee9c65f8 100644 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java -@@ -3329,11 +3329,13 @@ public abstract class LivingEntity extends Entity { +@@ -3332,11 +3332,13 @@ public abstract class LivingEntity extends Entity { return ((Byte) this.entityData.get(LivingEntity.DATA_LIVING_ENTITY_FLAGS) & 4) != 0; } @@ -114,10 +114,10 @@ index 5e781d0af08ba7faba84ee774e87f1c0d484ae9f..4e366fd032cf0ac37a7a851994625b90 this.dismountVehicle(entity); } diff --git a/src/main/java/net/minecraft/world/entity/player/Player.java b/src/main/java/net/minecraft/world/entity/player/Player.java -index 1a7bd2462bab95fa6986cef705e5e5b82da30063..857346b755454956268cc594bb03dc060f2a4aac 100644 +index 5dc5c12f341282f296082ce9c972808b8f155b1d..4ce8bdb30e24822273d6c608c8a2002877fa99fc 100644 --- a/src/main/java/net/minecraft/world/entity/player/Player.java +++ b/src/main/java/net/minecraft/world/entity/player/Player.java -@@ -1096,9 +1096,11 @@ public abstract class Player extends LivingEntity { +@@ -1092,9 +1092,11 @@ public abstract class Player extends LivingEntity { return -0.35D; } |