Skip to content
Open
Show file tree
Hide file tree
Changes from 13 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -358,21 +358,6 @@ public PotionEffectType convert(AreaEffectCloudApplyEvent event) {
.build());
// PlayerItemBreakEvent
registry.register(EventValue.simple(PlayerItemBreakEvent.class, ItemStack.class, PlayerItemBreakEvent::getBrokenItem));
// PlayerInteractEntityEvent
registry.register(EventValue.simple(PlayerInteractEntityEvent.class, Entity.class, PlayerInteractEntityEvent::getRightClicked));
registry.register(EventValue.simple(PlayerInteractEntityEvent.class, ItemStack.class, event -> {
EquipmentSlot hand = event.getHand();
if (hand == EquipmentSlot.HAND)
return event.getPlayer().getInventory().getItemInMainHand();
else if (hand == EquipmentSlot.OFF_HAND)
return event.getPlayer().getInventory().getItemInOffHand();
else
return null;
}));
// PlayerInteractEvent
registry.register(EventValue.simple(PlayerInteractEvent.class, ItemStack.class, PlayerInteractEvent::getItem));
registry.register(EventValue.simple(PlayerInteractEvent.class, Block.class, PlayerInteractEvent::getClickedBlock));
registry.register(EventValue.simple(PlayerInteractEvent.class, Direction.class, event -> new Direction(new double[]{event.getBlockFace().getModX(), event.getBlockFace().getModY(), event.getBlockFace().getModZ()})));
// PlayerShearEntityEvent
registry.register(EventValue.simple(PlayerShearEntityEvent.class, Entity.class, PlayerShearEntityEvent::getEntity));
// PlayerMoveEvent
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/ch/njol/skript/effects/EffCancelEvent.java
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@
import ch.njol.skript.doc.Example;
import ch.njol.skript.doc.Name;
import ch.njol.skript.doc.Since;
import ch.njol.skript.events.EvtClick;
import ch.njol.skript.lang.Effect;
import ch.njol.skript.lang.Expression;
import ch.njol.skript.lang.SkriptParser.ParseResult;
Expand All @@ -24,6 +23,7 @@
import org.bukkit.event.player.PlayerInteractEvent;
import org.bukkit.event.player.PlayerLoginEvent;
import org.jetbrains.annotations.Nullable;
import org.skriptlang.skript.bukkit.entity.player.elements.events.EvtClick;

@Name("Cancel Event")
@Description("Cancels the event (e.g. prevent blocks from being placed, or damage being taken).")
Expand Down
87 changes: 0 additions & 87 deletions src/main/java/ch/njol/skript/events/EvtAttemptAttack.java

This file was deleted.

37 changes: 0 additions & 37 deletions src/main/java/ch/njol/skript/events/EvtBookEdit.java

This file was deleted.

37 changes: 0 additions & 37 deletions src/main/java/ch/njol/skript/events/EvtBookSign.java

This file was deleted.

74 changes: 0 additions & 74 deletions src/main/java/ch/njol/skript/events/EvtCommand.java

This file was deleted.

39 changes: 0 additions & 39 deletions src/main/java/ch/njol/skript/events/EvtFirstJoin.java

This file was deleted.

46 changes: 0 additions & 46 deletions src/main/java/ch/njol/skript/events/EvtLevel.java

This file was deleted.

1 change: 1 addition & 0 deletions src/main/java/ch/njol/skript/events/EvtMoveOn.java
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@
import org.bukkit.event.player.PlayerMoveEvent;
import org.bukkit.plugin.EventExecutor;
import org.jetbrains.annotations.Nullable;
import org.skriptlang.skript.bukkit.entity.player.elements.events.EvtPressurePlate;

import java.util.ArrayList;
import java.util.HashSet;
Expand Down
Loading
Loading