Skip to content

- Fixed NPC push in SpongeForge #57

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
MGlolenstine wants to merge 1 commit into
base: api7
Choose a base branch
from
Open

- Fixed NPC push in SpongeForge #57

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
96 changes: 51 additions & 45 deletions src/main/java/me/mrdaniel/npcs/listeners/WorldListener.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

import javax.annotation.Nonnull;

import com.flowpowered.math.vector.Vector3d;
import org.spongepowered.api.data.key.Keys;
import org.spongepowered.api.entity.living.Living;
import org.spongepowered.api.entity.living.player.Player;
Expand All @@ -27,56 +28,61 @@

public class WorldListener extends NPCObject {

public WorldListener(@Nonnull final NPCs npcs) {
super(npcs);
}
public WorldListener(@Nonnull final NPCs npcs) {
super(npcs);
}

@Listener(order = Order.LATE)
public void onLoadWorld(final LoadWorldEvent e) {
World w = e.getTargetWorld();
Task.builder().delayTicks(100).execute(() -> super.getNPCs().getNPCManager().load(w)).submit(super.getNPCs());
}
@Listener(order = Order.LATE)
public void onLoadWorld(final LoadWorldEvent e) {
World w = e.getTargetWorld();
Task.builder().delayTicks(100).execute(() -> super.getNPCs().getNPCManager().load(w)).submit(super.getNPCs());
}

@Listener(order = Order.EARLY)
public void onEntitySpawn(final SpawnEntityEvent e) {
e.getEntities().forEach(ent -> ent.get(NPCData.class).ifPresent(data -> data.ifOld(super.getNPCs().getStartup(), () -> ent.remove())));
}
@Listener(order = Order.EARLY)
public void onEntitySpawn(final SpawnEntityEvent e) {
e.getEntities().forEach(ent -> ent.get(NPCData.class).ifPresent(data -> data.ifOld(super.getNPCs().getStartup(), () -> ent.remove())));
}

@Listener(order = Order.EARLY)
public void onCollide(final CollideEntityEvent e) {
e.getEntities().forEach(ent -> ent.get(NPCData.class).ifPresent(data -> e.setCancelled(true)));
}
@Listener(order = Order.EARLY)
public void onCollide(final CollideEntityEvent e) {
e.getEntities().forEach(ent -> ent.get(NPCData.class).ifPresent(data -> {
ent.setVelocity(Vector3d.ZERO);
e.setCancelled(true);
}));
}

@Listener(order = Order.EARLY)
public void onDamage(final DamageEntityEvent e) {
e.getTargetEntity().get(NPCData.class).ifPresent(data -> e.setCancelled(true));
}
@Listener(order = Order.EARLY)
public void onDamage(final DamageEntityEvent e) {
e.getTargetEntity().get(NPCData.class).ifPresent(data -> e.setCancelled(true));
}

@Listener(order = Order.EARLY)
public void onClick(final InteractEntityEvent e, @Root final Player p) {
e.getTargetEntity().get(NPCData.class).ifPresent(data -> {
Living npc = (Living) e.getTargetEntity();
e.setCancelled(!data.canInteract());
@Listener(order = Order.EARLY)
public void onClick(final InteractEntityEvent e, @Root final Player p) {
e.getTargetEntity().get(NPCData.class).ifPresent(data -> {
Living npc = (Living) e.getTargetEntity();
e.setCancelled(!data.canInteract());

if (e instanceof InteractEntityEvent.Secondary.MainHand) {
super.getNPCs().getNPCManager().getFile(data.getId()).ifPresent(file -> {
if (p.get(Keys.IS_SNEAKING).orElse(false) && p.hasPermission("npc.edit.select")) {
super.getNPCs().getMenuManager().select(p, npc, file);
}
else {
if (!super.getGame().getEventManager().post(new NPCEvent.Interact(super.getContainer(), p, npc, file))) {
try { super.getNPCs().getActionManager().execute(p.getUniqueId(), file); }
catch (final NPCException exc) { p.sendMessage(Text.of(TextColors.RED, "Failed to perform NPC actions: " + exc.getMessage())); }
}
}
});
}
});
}
if (e instanceof InteractEntityEvent.Secondary.MainHand) {
super.getNPCs().getNPCManager().getFile(data.getId()).ifPresent(file -> {
if (p.get(Keys.IS_SNEAKING).orElse(false) && p.hasPermission("npc.edit.select")) {
super.getNPCs().getMenuManager().select(p, npc, file);
} else {
if (!super.getGame().getEventManager().post(new NPCEvent.Interact(super.getContainer(), p, npc, file))) {
try {
super.getNPCs().getActionManager().execute(p.getUniqueId(), file);
} catch (final NPCException exc) {
p.sendMessage(Text.of(TextColors.RED, "Failed to perform NPC actions: " + exc.getMessage()));
}
}
}
});
}
});
}

@Listener(order = Order.LATE)
public void onQuit(final ClientConnectionEvent.Disconnect e) {
super.getNPCs().getMenuManager().deselect(e.getTargetEntity().getUniqueId());
super.getNPCs().getActionManager().removeChoosing(e.getTargetEntity().getUniqueId());
}
@Listener(order = Order.LATE)
public void onQuit(final ClientConnectionEvent.Disconnect e) {
super.getNPCs().getMenuManager().deselect(e.getTargetEntity().getUniqueId());
super.getNPCs().getActionManager().removeChoosing(e.getTargetEntity().getUniqueId());
}
}