Skip to content

Handle entity collision during teleportation #1088

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
JasperLorelai wants to merge 5 commits into
base: main
Choose a base branch
from
Open

Handle entity collision during teleportation #1088

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
13affba
refactor: Cleanup
JasperLorelai Jul 20, 2026
03a5e56
feat: Support any bounding box
JasperLorelai Jul 27, 2026
77f7962
feat: Improve collision and ground checks
JasperLorelai Jul 28, 2026
28050ca
feat: Improve phasing mechanics
JasperLorelai Jul 28, 2026
6938bf6
refactor: Remove player name to UUID file renaming
JasperLorelai Aug 3, 2026
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: 6 additions & 3 deletions core/src/main/java/com/nisovin/magicspells/MagicSpells.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,9 @@

import me.clip.placeholderapi.PlaceholderAPI;

import it.unimi.dsi.fastutil.objects.Object2IntMap;
import it.unimi.dsi.fastutil.objects.Object2IntOpenHashMap;

import com.nisovin.magicspells.util.*;
import com.nisovin.magicspells.events.*;
import com.nisovin.magicspells.handlers.*;
Expand Down Expand Up @@ -461,7 +464,7 @@ public void load() {
// Load xp system
if (config.getBoolean(path + "enable-magic-xp", false)) {
log("Loading xp system...");
magicXpHandler = new MagicXpHandler(this, config);
magicXpHandler = new MagicXpHandler(config);
log("...xp system loaded");
}

Expand Down Expand Up @@ -576,7 +579,7 @@ private void initMetrics() {
return map;
}));
metrics.addCustomChart(new AdvancedPie("passive_listeners", () -> {
IntMap<String> map = new IntMap<>();
Object2IntMap<String> map = new Object2IntOpenHashMap<>();
if (spells == null) return map;

for (Spell spell : spells.values()) {
Expand All @@ -585,7 +588,7 @@ private void initMetrics() {

for (PassiveListener listener : passiveSpell.getPassiveListeners()) {
String name = listener.getClass().getSimpleName();
map.increment(name.substring(0, name.lastIndexOf("Listener")));
map.mergeInt(name.substring(0, name.lastIndexOf("Listener")), 1, Integer::sum);
}
}
return map;
Expand Down
14 changes: 4 additions & 10 deletions core/src/main/java/com/nisovin/magicspells/Spellbook.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@
import org.bukkit.plugin.Plugin;
import org.bukkit.inventory.ItemStack;

import com.nisovin.magicspells.util.Util;
import com.nisovin.magicspells.util.CastItem;
import com.nisovin.magicspells.spells.BuffSpell;
import com.nisovin.magicspells.util.compat.EventUtil;
Expand All @@ -18,8 +17,6 @@
public class Spellbook {

private Player player;
private String playerName;
private String uniqueId;

private final Set<Spell> spells = new HashSet<>() {

Expand Down Expand Up @@ -57,10 +54,8 @@ public void clear() {

public Spellbook(Player player) {
this.player = player;
playerName = player.getName();
uniqueId = Util.getUniqueId(player);

MagicSpells.debug(1, "Loading player spell list: " + playerName);
MagicSpells.debug(1, "Loading player spell list: " + player.getName());
load();
}

Expand All @@ -73,7 +68,6 @@ public void destroy() {
temporarySpells.clear();

player = null;
playerName = null;
}

public void load() {
Expand Down Expand Up @@ -107,7 +101,7 @@ public void save() {
}

public void reload() {
MagicSpells.debug(1, "Reloading data for player '" + playerName + "'...");
MagicSpells.debug(1, "Reloading data for player '" + player.getName() + "'...");
removeAllSpells();
MagicSpells.getStorageHandler().load(this);
MagicSpells.debug(1, "...done");
Expand Down Expand Up @@ -486,8 +480,8 @@ public Map<Plugin, Set<Spell>> getTemporarySpells() {

@Override
public String toString() {
return "Spellbook:[playerName=" + playerName
+ ",uniqueId=" + uniqueId
return "Spellbook:[playerName=" + player.getName()
+ ",uniqueId=" + player.getUniqueId()
+ ",spells=" + spells
+ ",itemSpells=" + itemSpells
+ ",activeSpells=" + activeSpells
Expand Down
5 changes: 2 additions & 3 deletions ...rc/main/java/com/nisovin/magicspells/castmodifiers/conditions/ChestContainsCondition.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@
import org.jetbrains.annotations.NotNull;

import com.nisovin.magicspells.util.Name;
import com.nisovin.magicspells.util.BlockUtils;
import com.nisovin.magicspells.util.LocationUtil;
import com.nisovin.magicspells.castmodifiers.Condition;
import com.nisovin.magicspells.util.magicitems.MagicItems;
Expand Down Expand Up @@ -57,9 +56,9 @@ public boolean check(LivingEntity caster, Location location) {

private boolean checkChest() {
Block block = location.getBlock();
if (!BlockUtils.isChest(block)) return false;
if (!(block.getState() instanceof Chest chest)) return false;

for (ItemStack item : ((Chest) block.getState()).getInventory().getContents()) {
for (ItemStack item : chest.getInventory().getContents()) {
MagicItemData data = MagicItems.getMagicItemDataFromItemStack(item);
if (data == null) continue;
if (itemData.matches(data)) return true;
Expand Down
Loading
Loading