Skip to content

Teleport pets with player #7400

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

Closed
jwkerr wants to merge 3 commits into from
Closed

Teleport pets with player #7400

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a9b1121
Teleport pets with player
jwkerr May 4, 2024
706e36c
Add comment to teleportEntities method
jwkerr May 4, 2024
c1251fb
Some changes from review
jwkerr May 13, 2024
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
9 changes: 7 additions & 2 deletions Towny/src/main/java/com/palmergames/bukkit/towny/tasks/TeleportWarmupTimerTask.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,19 +13,22 @@
import com.palmergames.bukkit.towny.object.Translatable;
import com.palmergames.bukkit.towny.object.Translation;
import com.palmergames.bukkit.towny.object.economy.Account;
import com.palmergames.bukkit.towny.utils.SpawnUtil;
import com.palmergames.bukkit.util.BukkitTools;

import io.papermc.lib.PaperLib;

import org.bukkit.Location;
import org.bukkit.NamespacedKey;
import org.bukkit.entity.Entity;
import org.bukkit.entity.Player;
import org.bukkit.event.player.PlayerTeleportEvent.TeleportCause;
import org.jetbrains.annotations.Contract;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;

import java.util.Iterator;
import java.util.List;
import java.util.Map;
import java.util.concurrent.ConcurrentHashMap;

Expand Down Expand Up @@ -64,8 +67,10 @@ public void run() {
// Only teleport & add cooldown if player is valid
if (player == null)
continue;

PaperLib.teleportAsync(player, request.destinationLocation(), TeleportCause.COMMAND);

List<Entity> pets = SpawnUtil.getPets(player);
pets.add(player);

@Warriorrrr Warriorrrr May 5, 2024

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Would be better to call it entities since the player is added to it (and is not a pet)

@LlmDl LlmDl May 6, 2024

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Came here to say this.

SpawnUtil.teleportEntities(request.destinationLocation(), pets, TeleportCause.COMMAND);

if (request.cooldown() > 0)
CooldownTimerTask.addCooldownTimer(resident.getName(), "teleport", request.cooldown());
Expand Down
52 changes: 50 additions & 2 deletions Towny/src/main/java/com/palmergames/bukkit/towny/utils/SpawnUtil.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
package com.palmergames.bukkit.towny.utils;

import java.util.ArrayList;
import java.util.List;
import java.util.Locale;
import java.util.Objects;
Expand All @@ -19,7 +20,11 @@
import io.papermc.lib.PaperLib;
import org.bukkit.Bukkit;
import org.bukkit.Location;
import org.bukkit.entity.AnimalTamer;
import org.bukkit.entity.Entity;
import org.bukkit.entity.Player;
import org.bukkit.entity.Sittable;
import org.bukkit.entity.Tameable;
import org.bukkit.event.player.PlayerTeleportEvent.TeleportCause;

import com.palmergames.bukkit.towny.Towny;
Expand Down Expand Up @@ -669,12 +674,52 @@ private static void initiateSpawn(Player player, Location spawnLoc, int cooldown
// Don't use teleport warmup
if (player.getVehicle() != null)
player.getVehicle().eject();
PaperLib.teleportAsync(player, spawnLoc, TeleportCause.COMMAND);

List<Entity> pets = getPets(player);
pets.add(player);
teleportEntities(spawnLoc, pets, TeleportCause.COMMAND);
if (cooldown > 0 && !hasPerm(player, PermissionNodes.TOWNY_SPAWN_ADMIN_NOCOOLDOWN))
CooldownTimerTask.addCooldownTimer(player.getName(), "teleport", cooldown);
}
}

/**
* Gets any pets owned by the specified player that are nearby them
*
* @param player The player to get the pets of
*/
public static List<Entity> getPets(Player player) {

@Warriorrrr Warriorrrr May 4, 2024

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
public static List<Entity> getPets(Player player) {
public static Collection<Entity> getPets(Player player) {

List<Entity> pets = new ArrayList<>();

for (Entity entity : player.getNearbyEntities(16, 16, 16)) {
if (!(entity instanceof Tameable tameable)) continue;

@Warriorrrr Warriorrrr May 5, 2024

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
for (Entity entity : player.getNearbyEntities(16, 16, 16)) {
if (!(entity instanceof Tameable tameable)) continue;
for (Tameable tameable : player.getLocation().getNearbyEntitiesByType(Tameable.class, 16)) {

@jwkerr jwkerr May 6, 2024

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this method doesn't seem to exist

@Warriorrrr Warriorrrr May 11, 2024

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I was looking at the paper javadocs, but the same method exists on World on spigot

AnimalTamer tamer = tameable.getOwner();
if (tamer == null) continue;

if (!(entity instanceof Sittable sittable)) continue;

@Warriorrrr Warriorrrr May 5, 2024

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

What about non sittable pets? When #6865 is merged the types of entities that are teleported could be made configurable

@jwkerr jwkerr May 5, 2024

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

what pets are non-sittable that also follow you like a dog or cat

@jwkerr jwkerr May 5, 2024 •
edited
Loading

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

or do you mean for adding things like horses, camels etc.

if that's the case i could change it to check if they are currently riding something

if (sittable.isSitting()) continue;

if (tamer.equals(player))
pets.add(entity);
}

return pets;
}

/**
* Teleports all specified entities to the specified location
*
* @param loc Location to teleport to
* @param entities Entities to teleport
* @param cause What caused the teleport
*/
public static void teleportEntities(Location loc, List<Entity> entities, TeleportCause cause) {

@Warriorrrr Warriorrrr May 5, 2024 •
edited
Loading

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
public static void teleportEntities(Location loc, List<Entity> entities, TeleportCause cause) {
public static void teleportEntities(Location loc, Iterable<Entity> entities, TeleportCause cause) {

for (Entity entity : entities) {
PaperLib.teleportAsync(entity, loc, cause);
}
}

/**
* Begin a costed teleportation.
*
Expand Down Expand Up @@ -745,8 +790,11 @@ private static void initiatePluginTeleport(Resident resident, Location loc, bool
final Player player = resident.getPlayer();
if (player == null)
return;

List<Entity> pets = getPets(player);
pets.add(player);

plugin.getScheduler().runLater(player, () -> PaperLib.teleportAsync(resident.getPlayer(), loc, TeleportCause.PLUGIN),
plugin.getScheduler().runLater(player, () -> teleportEntities(loc, pets, TeleportCause.PLUGIN),
ignoreWarmup ? 0 : TownySettings.getTeleportWarmupTime() * 20L);
}

Expand Down