Upstream
/
DungeonsXL
mirror of https://github.com/DRE2N/DungeonsXL.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Add presence trigger

This commit is contained in:
Daniel Saukel 2020-06-19 00:44:14 +02:00
parent 4ca4112ee8
commit 3bab956591
4 changed files with 66 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
core/src/main/java/de/erethon/dungeonsxl/trigger/DistanceTrigger.java
View File

@ -74,10 +74,12 @@ public class DistanceTrigger extends Trigger {
return;
}
for (Trigger uncasted : gameWorld.getTriggers(TriggerTypeDefault.DISTANCE)) {
DistanceTrigger trigger = (DistanceTrigger) uncasted;
if (player.getLocation().distance(trigger.loc) < trigger.distance) {
trigger.onTrigger(player);
for (Trigger trigger : gameWorld.getTriggers()) {
if (trigger instanceof DistanceTrigger) {
DistanceTrigger distanceTrigger = (DistanceTrigger) trigger;
if (player.getLocation().distance(distanceTrigger.loc) < distanceTrigger.distance) {
distanceTrigger.onTrigger(player);
}
}
}
}

55
core/src/main/java/de/erethon/dungeonsxl/trigger/PresenceTrigger.java Normal file
View File

@ -0,0 +1,55 @@
/*
* Copyright (C) 2012-2020 Frank Baumann
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
package de.erethon.dungeonsxl.trigger;
import de.erethon.dungeonsxl.event.trigger.TriggerActionEvent;
import org.bukkit.Bukkit;
import org.bukkit.Location;
import org.bukkit.entity.Player;
/**
* @author Daniel Saukel
*/
public class PresenceTrigger extends DistanceTrigger {
public PresenceTrigger(int distance, Location loc) {
super(distance, loc);
}
public PresenceTrigger(Location loc) {
super(loc);
}
@Override
public void onTrigger(Player player) {
TriggerActionEvent event = new TriggerActionEvent(this);
Bukkit.getPluginManager().callEvent(event);
if (event.isCancelled()) {
return;
}
setTriggered(true);
setPlayer(player);
updateDSigns();
}
@Override
public TriggerType getType() {
return TriggerTypeDefault.PRESENCE;
}
}

19
core/src/main/java/de/erethon/dungeonsxl/trigger/Trigger.java
View File

@ -124,74 +124,63 @@ public abstract class Trigger implements de.erethon.dungeonsxl.api.Trigger {
Trigger trigger = null;
if (type == TriggerTypeDefault.REDSTONE) {
trigger = RedstoneTrigger.getOrCreate(dSign.getSign(), gameWorld);
} else if (type == TriggerTypeDefault.DISTANCE) {
if (value != null) {
trigger = new DistanceTrigger(NumberUtil.parseInt(value), dSign.getSign().getLocation());
} else {
trigger = new DistanceTrigger(dSign.getSign().getLocation());
}
} else if (type == TriggerTypeDefault.FORTUNE) {
if (value != null) {
trigger = new FortuneTrigger(NumberUtil.parseDouble(value));
}
} else if (type == TriggerTypeDefault.SIGN) {
if (value != null) {
trigger = SignTrigger.getOrCreate(NumberUtil.parseInt(value), gameWorld);
}
} else if (type == TriggerTypeDefault.INTERACT) {
if (value != null) {
trigger = InteractTrigger.getOrCreate(NumberUtil.parseInt(value), gameWorld);
}
} else if (type == TriggerTypeDefault.MOB) {
if (value != null) {
trigger = MobTrigger.getOrCreate(value, gameWorld);
}
} else if (type == TriggerTypeDefault.PROGRESS) {
} else if (type == TriggerTypeDefault.PRESENCE) {
if (value != null) {
if (value.matches("[0-99]/[0-999]")) {
int floorCount = NumberUtil.parseInt(value.split("/")[0]);
int waveCount = NumberUtil.parseInt(value.split("/")[1]);
trigger = ProgressTrigger.getOrCreate(floorCount, waveCount, gameWorld);
} else {
trigger = ProgressTrigger.getOrCreate(plugin, value, gameWorld);
trigger = new PresenceTrigger(NumberUtil.parseInt(value), dSign.getSign().getLocation());
}
} else {
trigger = new PresenceTrigger(dSign.getSign().getLocation());
}
} else if (type == TriggerTypeDefault.USE_ITEM) {
if (value != null) {
trigger = UseItemTrigger.getOrCreate(plugin, value, gameWorld);
}
} else if (type == TriggerTypeDefault.WAVE) {
if (value != null) {
trigger = WaveTrigger.getOrCreate(NumberUtil.parseDouble(value, 1), gameWorld);
}
} else if (type != null) {
Method method;
try {
method = type.getHandler().getDeclaredMethod("getOrCreate", String.class, DGameWorld.class);
trigger = (Trigger) method.invoke(value, dSign.getGameWorld());
} catch (NoSuchMethodException | SecurityException | IllegalAccessException | IllegalArgumentException | InvocationTargetException exception) {
MessageUtil.log("An error occurred while accessing the handler class of the sign " + type.getIdentifier() + ": " + exception.getClass().getSimpleName());
if (!(type instanceof TriggerTypeDefault)) {

2
core/src/main/java/de/erethon/dungeonsxl/trigger/TriggerTypeDefault.java
View File

@ -27,7 +27,7 @@ public enum TriggerTypeDefault implements TriggerType {
FORTUNE("F", FortuneTrigger.class),
INTERACT("I", InteractTrigger.class),
MOB("M", MobTrigger.class),
PROGRESS("P", ProgressTrigger.class),
PRESENCE("P", PresenceTrigger.class),
REDSTONE("R", RedstoneTrigger.class),
SIGN("T", SignTrigger.class),
USE_ITEM("U", UseItemTrigger.class),