Skip to content

Check for entity owners in Hunt-type quests #114

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
magneticflux- wants to merge 1 commit into
base: 1.18.x
Choose a base branch
from
Open

Check for entity owners in Hunt-type quests #114

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
28 changes: 16 additions & 12 deletions src/main/java/svenhjol/strange/module/quests/component/HuntComponent.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
import net.minecraft.server.level.ServerPlayer;
import net.minecraft.world.entity.Entity;
import net.minecraft.world.entity.LivingEntity;
import net.minecraft.world.entity.OwnableEntity;
import net.minecraft.world.entity.player.Player;
import svenhjol.strange.module.quests.IQuestComponent;
import svenhjol.strange.module.quests.Quest;
Expand Down Expand Up @@ -146,18 +147,21 @@ public boolean isSatisfied(Player player) {

@Override
public void entityKilled(LivingEntity entity, Entity attacker) {
if (!(attacker instanceof ServerPlayer player)) return;

if (quest.getOwner().equals(player.getUUID())) {
ResourceLocation id = Registry.ENTITY_TYPE.getKey(entity.getType());

if (entities.containsKey(id)) {
int max = entities.get(id);
int count = killed.getOrDefault(id, 0);
killed.put(id, Math.min(max, count + 1));

quest.setDirty();
quest.update(player);
if (attacker instanceof OwnableEntity owned) {
attacker = owned.getOwner();
}
if (attacker instanceof ServerPlayer player) {
if (quest.getOwner().equals(player.getUUID())) {
ResourceLocation id = Registry.ENTITY_TYPE.getKey(entity.getType());

if (entities.containsKey(id)) {
int max = entities.get(id);
int count = killed.getOrDefault(id, 0);
killed.put(id, Math.min(max, count + 1));

quest.setDirty();
quest.update(player);
}
}
}
}
Expand Down