| 
									
										
										
										
											2021-06-11 14:02:28 +02:00
										 |  |  | From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 | 
					
						
							|  |  |  | From: Brokkonaut <hannos17@gmx.de> | 
					
						
							|  |  |  | Date: Mon, 18 Jun 2018 15:40:39 +0200 | 
					
						
							| 
									
										
										
										
											2022-12-23 20:59:11 +01:00
										 |  |  | Subject: [PATCH] Add EntityKnockbackByEntityEvent and | 
					
						
							|  |  |  |  EntityPushedByEntityAttackEvent | 
					
						
							| 
									
										
										
										
											2021-06-11 14:02:28 +02:00
										 |  |  | 
 | 
					
						
							| 
									
										
										
										
											2022-12-23 20:59:11 +01:00
										 |  |  | Co-authored-by: aerulion <aerulion@gmail.com> | 
					
						
							| 
									
										
										
										
											2021-06-11 14:02:28 +02:00
										 |  |  | 
 | 
					
						
							|  |  |  | diff --git a/src/main/java/com/destroystokyo/paper/event/entity/EntityKnockbackByEntityEvent.java b/src/main/java/com/destroystokyo/paper/event/entity/EntityKnockbackByEntityEvent.java
 | 
					
						
							|  |  |  | new file mode 100644 | 
					
						
							| 
									
										
										
										
											2024-02-01 10:15:57 +01:00
										 |  |  | index 0000000000000000000000000000000000000000..e0ba692c9b107f2b042a9c06549185e1c4777e27
 | 
					
						
							| 
									
										
										
										
											2021-06-11 14:02:28 +02:00
										 |  |  | --- /dev/null
 | 
					
						
							|  |  |  | +++ b/src/main/java/com/destroystokyo/paper/event/entity/EntityKnockbackByEntityEvent.java
 | 
					
						
							| 
									
										
										
										
											2024-02-01 10:15:57 +01:00
										 |  |  | @@ -0,0 +1,48 @@
 | 
					
						
							| 
									
										
										
										
											2021-06-11 14:02:28 +02:00
										 |  |  | +package com.destroystokyo.paper.event.entity;
 | 
					
						
							|  |  |  | +
 | 
					
						
							| 
									
										
										
										
											2022-12-23 20:59:11 +01:00
										 |  |  | +import io.papermc.paper.event.entity.EntityPushedByEntityAttackEvent;
 | 
					
						
							| 
									
										
										
										
											2021-06-11 14:02:28 +02:00
										 |  |  | +import org.bukkit.entity.Entity;
 | 
					
						
							|  |  |  | +import org.bukkit.entity.LivingEntity;
 | 
					
						
							|  |  |  | +import org.bukkit.util.Vector;
 | 
					
						
							| 
									
										
										
										
											2024-02-01 10:15:57 +01:00
										 |  |  | +import org.jetbrains.annotations.ApiStatus;
 | 
					
						
							| 
									
										
										
										
											2021-06-11 14:02:28 +02:00
										 |  |  | +import org.jetbrains.annotations.NotNull;
 | 
					
						
							|  |  |  | +
 | 
					
						
							|  |  |  | +/**
 | 
					
						
							|  |  |  | + * Fired when an Entity is knocked back by the hit of another Entity. The acceleration
 | 
					
						
							|  |  |  | + * vector can be modified. If this event is cancelled, the entity is not knocked back.
 | 
					
						
							|  |  |  | + */
 | 
					
						
							| 
									
										
										
										
											2022-12-23 20:59:11 +01:00
										 |  |  | +public class EntityKnockbackByEntityEvent extends EntityPushedByEntityAttackEvent {
 | 
					
						
							| 
									
										
										
										
											2024-02-01 10:15:57 +01:00
										 |  |  | +
 | 
					
						
							| 
									
										
										
										
											2022-12-23 20:59:11 +01:00
										 |  |  | +    private final float knockbackStrength;
 | 
					
						
							|  |  |  | +
 | 
					
						
							| 
									
										
										
										
											2024-02-01 10:15:57 +01:00
										 |  |  | +    @ApiStatus.Internal
 | 
					
						
							| 
									
										
										
										
											2022-12-23 20:59:11 +01:00
										 |  |  | +    public EntityKnockbackByEntityEvent(@NotNull LivingEntity entity, @NotNull Entity hitBy, float knockbackStrength, @NotNull Vector acceleration) {
 | 
					
						
							|  |  |  | +        super(entity, hitBy, acceleration);
 | 
					
						
							|  |  |  | +        this.knockbackStrength = knockbackStrength;
 | 
					
						
							|  |  |  | +    }
 | 
					
						
							|  |  |  | +
 | 
					
						
							|  |  |  | +    /**
 | 
					
						
							|  |  |  | +     * @return the entity which was knocked back
 | 
					
						
							|  |  |  | +     */
 | 
					
						
							|  |  |  | +    @NotNull
 | 
					
						
							|  |  |  | +    @Override
 | 
					
						
							|  |  |  | +    public LivingEntity getEntity() {
 | 
					
						
							|  |  |  | +        return (LivingEntity) super.getEntity();
 | 
					
						
							|  |  |  | +    }
 | 
					
						
							|  |  |  | +
 | 
					
						
							|  |  |  | +    /**
 | 
					
						
							|  |  |  | +     * @return the original knockback strength.
 | 
					
						
							|  |  |  | +     */
 | 
					
						
							|  |  |  | +    public float getKnockbackStrength() {
 | 
					
						
							| 
									
										
										
										
											2024-02-01 10:15:57 +01:00
										 |  |  | +        return this.knockbackStrength;
 | 
					
						
							| 
									
										
										
										
											2022-12-23 20:59:11 +01:00
										 |  |  | +    }
 | 
					
						
							|  |  |  | +
 | 
					
						
							|  |  |  | +    /**
 | 
					
						
							|  |  |  | +     * @return the Entity which hit
 | 
					
						
							|  |  |  | +     */
 | 
					
						
							|  |  |  | +    @NotNull
 | 
					
						
							|  |  |  | +    public Entity getHitBy() {
 | 
					
						
							|  |  |  | +        return super.getPushedBy();
 | 
					
						
							|  |  |  | +    }
 | 
					
						
							|  |  |  | +
 | 
					
						
							|  |  |  | +}
 | 
					
						
							|  |  |  | diff --git a/src/main/java/io/papermc/paper/event/entity/EntityPushedByEntityAttackEvent.java b/src/main/java/io/papermc/paper/event/entity/EntityPushedByEntityAttackEvent.java
 | 
					
						
							|  |  |  | new file mode 100644 | 
					
						
							| 
									
										
										
										
											2024-02-01 10:15:57 +01:00
										 |  |  | index 0000000000000000000000000000000000000000..70d6e72d4dc0c040c8bccf7acc383e84db472514
 | 
					
						
							| 
									
										
										
										
											2022-12-23 20:59:11 +01:00
										 |  |  | --- /dev/null
 | 
					
						
							|  |  |  | +++ b/src/main/java/io/papermc/paper/event/entity/EntityPushedByEntityAttackEvent.java
 | 
					
						
							| 
									
										
										
										
											2024-02-01 10:15:57 +01:00
										 |  |  | @@ -0,0 +1,74 @@
 | 
					
						
							| 
									
										
										
										
											2022-12-23 20:59:11 +01:00
										 |  |  | +package io.papermc.paper.event.entity;
 | 
					
						
							|  |  |  | +
 | 
					
						
							|  |  |  | +import org.bukkit.entity.Entity;
 | 
					
						
							|  |  |  | +import org.bukkit.event.Cancellable;
 | 
					
						
							|  |  |  | +import org.bukkit.event.HandlerList;
 | 
					
						
							|  |  |  | +import org.bukkit.event.entity.EntityEvent;
 | 
					
						
							|  |  |  | +import org.bukkit.util.Vector;
 | 
					
						
							| 
									
										
										
										
											2024-02-01 10:15:57 +01:00
										 |  |  | +import org.jetbrains.annotations.ApiStatus;
 | 
					
						
							| 
									
										
										
										
											2022-12-23 20:59:11 +01:00
										 |  |  | +import org.jetbrains.annotations.NotNull;
 | 
					
						
							|  |  |  | +
 | 
					
						
							|  |  |  | +/**
 | 
					
						
							|  |  |  | + * Fired when an entity is pushed by another entity's attack. The acceleration vector can be
 | 
					
						
							|  |  |  | + * modified. If this event is cancelled, the entity will not get pushed.
 | 
					
						
							|  |  |  | + * <p>
 | 
					
						
							|  |  |  | + * Note: Some entities might trigger this multiple times on the same entity
 | 
					
						
							|  |  |  | + * as multiple acceleration calculations are done.
 | 
					
						
							|  |  |  | + */
 | 
					
						
							|  |  |  | +public class EntityPushedByEntityAttackEvent extends EntityEvent implements Cancellable {
 | 
					
						
							|  |  |  | +
 | 
					
						
							| 
									
										
										
										
											2024-02-01 10:15:57 +01:00
										 |  |  | +    private static final HandlerList HANDLER_LIST = new HandlerList();
 | 
					
						
							| 
									
										
										
										
											2021-06-11 14:02:28 +02:00
										 |  |  | +
 | 
					
						
							| 
									
										
										
										
											2022-12-23 20:59:11 +01:00
										 |  |  | +    private final @NotNull Entity pushedBy;
 | 
					
						
							|  |  |  | +    private final @NotNull Vector acceleration;
 | 
					
						
							| 
									
										
										
										
											2021-06-11 14:02:28 +02:00
										 |  |  | +
 | 
					
						
							| 
									
										
										
										
											2024-02-01 10:15:57 +01:00
										 |  |  | +    private boolean cancelled;
 | 
					
						
							|  |  |  | +
 | 
					
						
							|  |  |  | +    @ApiStatus.Internal
 | 
					
						
							| 
									
										
										
										
											2022-12-23 20:59:11 +01:00
										 |  |  | +    public EntityPushedByEntityAttackEvent(@NotNull Entity entity, @NotNull Entity pushedBy, @NotNull Vector acceleration) {
 | 
					
						
							| 
									
										
										
										
											2021-06-11 14:02:28 +02:00
										 |  |  | +        super(entity);
 | 
					
						
							| 
									
										
										
										
											2022-12-23 20:59:11 +01:00
										 |  |  | +        this.pushedBy = pushedBy;
 | 
					
						
							| 
									
										
										
										
											2021-06-11 14:02:28 +02:00
										 |  |  | +        this.acceleration = acceleration;
 | 
					
						
							|  |  |  | +    }
 | 
					
						
							|  |  |  | +
 | 
					
						
							| 
									
										
										
										
											2024-02-01 10:15:57 +01:00
										 |  |  | +    /**
 | 
					
						
							|  |  |  | +     * Gets the entity which pushed the affected entity.
 | 
					
						
							|  |  |  | +     *
 | 
					
						
							|  |  |  | +     * @return the pushing entity
 | 
					
						
							|  |  |  | +     */
 | 
					
						
							| 
									
										
										
										
											2021-06-11 14:02:28 +02:00
										 |  |  | +    @NotNull
 | 
					
						
							| 
									
										
										
										
											2024-02-01 10:15:57 +01:00
										 |  |  | +    public Entity getPushedBy() {
 | 
					
						
							|  |  |  | +        return this.pushedBy;
 | 
					
						
							| 
									
										
										
										
											2021-06-11 14:02:28 +02:00
										 |  |  | +    }
 | 
					
						
							|  |  |  | +
 | 
					
						
							| 
									
										
										
										
											2024-02-01 10:15:57 +01:00
										 |  |  | +    /**
 | 
					
						
							|  |  |  | +     * Gets the acceleration that will be applied to the affected entity.
 | 
					
						
							|  |  |  | +     *
 | 
					
						
							|  |  |  | +     * @return the acceleration vector
 | 
					
						
							|  |  |  | +     */
 | 
					
						
							| 
									
										
										
										
											2021-06-11 14:02:28 +02:00
										 |  |  | +    @NotNull
 | 
					
						
							| 
									
										
										
										
											2024-02-01 10:15:57 +01:00
										 |  |  | +    public Vector getAcceleration() {
 | 
					
						
							|  |  |  | +        return this.acceleration;
 | 
					
						
							| 
									
										
										
										
											2021-06-11 14:02:28 +02:00
										 |  |  | +    }
 | 
					
						
							|  |  |  | +
 | 
					
						
							|  |  |  | +    @Override
 | 
					
						
							|  |  |  | +    public boolean isCancelled() {
 | 
					
						
							| 
									
										
										
										
											2024-02-01 10:15:57 +01:00
										 |  |  | +        return this.cancelled;
 | 
					
						
							| 
									
										
										
										
											2021-06-11 14:02:28 +02:00
										 |  |  | +    }
 | 
					
						
							|  |  |  | +
 | 
					
						
							|  |  |  | +    @Override
 | 
					
						
							|  |  |  | +    public void setCancelled(boolean cancel) {
 | 
					
						
							| 
									
										
										
										
											2024-02-01 10:15:57 +01:00
										 |  |  | +        this.cancelled = cancel;
 | 
					
						
							| 
									
										
										
										
											2021-06-11 14:02:28 +02:00
										 |  |  | +    }
 | 
					
						
							|  |  |  | +
 | 
					
						
							|  |  |  | +    @NotNull
 | 
					
						
							| 
									
										
										
										
											2024-02-01 10:15:57 +01:00
										 |  |  | +    @Override
 | 
					
						
							|  |  |  | +    public HandlerList getHandlers() {
 | 
					
						
							|  |  |  | +        return HANDLER_LIST;
 | 
					
						
							| 
									
										
										
										
											2021-06-11 14:02:28 +02:00
										 |  |  | +    }
 | 
					
						
							|  |  |  | +
 | 
					
						
							|  |  |  | +    @NotNull
 | 
					
						
							| 
									
										
										
										
											2024-02-01 10:15:57 +01:00
										 |  |  | +    public static HandlerList getHandlerList() {
 | 
					
						
							|  |  |  | +        return HANDLER_LIST;
 | 
					
						
							| 
									
										
										
										
											2021-06-11 14:02:28 +02:00
										 |  |  | +    }
 | 
					
						
							|  |  |  | +}
 |