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

Revert "Move ChunkLoadEvent to separate ChunkListener class" 

This reverts commit f234cdd73e.
This commit is contained in:
ceze88 2023-04-10 17:14:37 +02:00
parent e073cab322
commit f2b9cbce3e
4 changed files with 9 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/main/java/com/songoda/ultimatestacker/UltimateStacker.java
View File

@ -281,7 +281,6 @@ public class UltimateStacker extends SongodaPlugin {
}
}
});
getServer().getPluginManager().registerEvents(new ChunkListener(this), this);
}
public void addExp(Player player, EntityStack stack) {

8
src/main/java/com/songoda/ultimatestacker/listeners/BlockListeners.java
View File

@ -45,6 +45,14 @@ public class BlockListeners implements Listener {
this.plugin = plugin;
}
@EventHandler
public void onChunkLoad(ChunkLoadEvent event) {
if (!Settings.STACK_BLOCKS.getBoolean()) return;
Chunk chunk = event.getChunk();
BlockStackManager blockStackManager = plugin.getBlockStackManager();
blockStackManager.getStacks().stream().filter(stack -> stack.getLocation().getChunk().equals(chunk)).forEach(plugin::updateHologram);
}
@EventHandler(priority = EventPriority.HIGHEST)
public void onBlockInteract(PlayerInteractEvent event) {
if (event.useInteractedBlock() == Event.Result.DENY) return;

28
src/main/java/com/songoda/ultimatestacker/listeners/ChunkListener.java
View File

@ -1,28 +0,0 @@
package com.songoda.ultimatestacker.listeners;
import com.songoda.ultimatestacker.UltimateStacker;
import com.songoda.ultimatestacker.settings.Settings;
import com.songoda.ultimatestacker.stackable.block.BlockStackManager;
import org.bukkit.Chunk;
import org.bukkit.event.EventHandler;
import org.bukkit.event.Listener;
import org.bukkit.event.world.ChunkLoadEvent;
public class ChunkListener implements Listener {
private final BlockStackManager blockStackManager;
private final UltimateStacker plugin;
public ChunkListener(UltimateStacker plugin) {
this.blockStackManager = plugin.getBlockStackManager();
this.plugin = plugin;
}
@EventHandler
public void onChunkLoad(ChunkLoadEvent event) {
if (!Settings.STACK_BLOCKS.getBoolean()) return;
Chunk chunk = event.getChunk();
BlockStackManager blockStackManager = plugin.getBlockStackManager();
blockStackManager.getStacks().stream().filter(stack -> stack.getLocation().getChunk().equals(chunk)).forEach(plugin::updateHologram);
}
}

3
src/main/java/com/songoda/ultimatestacker/stackable/block/BlockStackManager.java
View File

@ -8,11 +8,10 @@ import java.util.Collection;
import java.util.Collections;
import java.util.HashMap;
import java.util.Map;
import java.util.concurrent.ConcurrentHashMap;
public class BlockStackManager {
private final Map<Location, BlockStack> registeredBlocks = new ConcurrentHashMap<>();
private final Map<Location, BlockStack> registeredBlocks = new HashMap<>();
public void addBlocks(Map<Location, BlockStack> blocks) {
this.registeredBlocks.putAll(blocks);