Skip to content

Commit dcc49e7

Browse files
committed
Add PlayerAttackEntityEvent.(get/set)UseExtraKockback() API
1 parent 09bc7f6 commit dcc49e7

File tree

3 files changed

+13
-10
lines changed

3 files changed

+13
-10
lines changed

loader/src/main/java/com/fox2code/foxloader/event/interaction/PlayerAttackEntityEvent.java

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,11 +34,13 @@
3434
public final class PlayerAttackEntityEvent extends PlayerEvent implements Event.Cancellable {
3535
private final ItemStack heldItem;
3636
private final Entity target;
37+
private boolean useExtraKockback;
3738

3839
public PlayerAttackEntityEvent(@NotNull EntityPlayer entityPlayer, @Nullable ItemStack heldItem, @NotNull Entity target) {
3940
super(entityPlayer);
4041
this.heldItem = heldItem;
4142
this.target = target;
43+
this.useExtraKockback = target.isSprinting();
4244
}
4345

4446
@Nullable public ItemStack getHeldItem() {
@@ -48,4 +50,12 @@ public PlayerAttackEntityEvent(@NotNull EntityPlayer entityPlayer, @Nullable Ite
4850
@NotNull public Entity getTarget() {
4951
return this.target;
5052
}
53+
54+
public boolean getUseExtraKockback() {
55+
return this.useExtraKockback;
56+
}
57+
58+
public void setUseExtraKockback(boolean useExtraKockback) {
59+
this.useExtraKockback = useExtraKockback;
60+
}
5161
}

loader/src/main/java/com/fox2code/foxloader/internal/InternalInteractionHooks.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -119,6 +119,8 @@ public static boolean sendPlayerAttackEntityEvent(EntityPlayer player, Entity ta
119119
PlayerAttackEntityEvent playerAttackEntityEvent =
120120
new PlayerAttackEntityEvent(player, player.inventory.getCurrentItem(), target);
121121
PLAYER_ATTACK_ENTITY_EVENT.callEvent(playerAttackEntityEvent);
122+
player.setSprinting(!playerAttackEntityEvent.isCancelled() &&
123+
playerAttackEntityEvent.getUseExtraKockback());
122124
return playerAttackEntityEvent.isCancelled();
123125
}
124126

loader/src/main/java/com/fox2code/foxloader/loader/ModLoader.java

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
import com.fox2code.foxloader.energy.FoxPowerUtils;
3131
import com.fox2code.foxloader.event.FoxLoaderEvents;
3232
import com.fox2code.foxloader.event.client.GuiScreenInitEvent;
33-
import com.fox2code.foxloader.event.inventory.PlayerDropItemEvent;
33+
import com.fox2code.foxloader.event.interaction.PlayerAttackEntityEvent;
3434
import com.fox2code.foxloader.event.lifecycle.LifecycleStartEvent;
3535
import com.fox2code.foxloader.internal.InternalTranslateHooks;
3636
import com.fox2code.foxloader.launcher.FoxLauncher;
@@ -202,15 +202,6 @@ public void onLifecycle(LifecycleStartEvent lifecycleStartEvent) {
202202
FoxPowerUtils.updateMaxSinkPriorityValue();
203203
}
204204

205-
@EventHandler
206-
public void onItemDrop(PlayerDropItemEvent dropItemEvent) {
207-
this.getLogger().info(dropItemEvent.getItemToDrop().getItemName() +
208-
" -> " + dropItemEvent.getMaxAmountToDrop());
209-
if (!dropItemEvent.getEntityPlayer().worldObj.isRemote) {
210-
dropItemEvent.setCancelled(true);
211-
}
212-
}
213-
214205
public static boolean areAllModsLoaded() {
215206
return areAllModsLoaded;
216207
}

0 commit comments

Comments
 (0)