|
16 | 16 | import org.bukkit.event.EventPriority; |
17 | 17 | import org.bukkit.event.Listener; |
18 | 18 | import org.bukkit.event.block.BlockBreakEvent; |
| 19 | +import org.bukkit.event.player.PlayerChangedWorldEvent; |
19 | 20 | import org.bukkit.event.player.PlayerInteractEvent; |
20 | 21 | import org.bukkit.event.player.PlayerJoinEvent; |
21 | 22 | import org.bukkit.event.player.PlayerQuitEvent; |
@@ -64,6 +65,34 @@ public void onJoin(PlayerJoinEvent event) { |
64 | 65 | player.sendBlockChanges(states); |
65 | 66 | } |
66 | 67 |
|
| 68 | + @EventHandler |
| 69 | + public void onWorldChange(PlayerChangedWorldEvent event) { |
| 70 | + Player player = event.getPlayer(); |
| 71 | + Set<BlockState> states = new HashSet<>(); |
| 72 | + |
| 73 | + manager.getBlocks(event.getFrom()).stream() |
| 74 | + .filter(packetBlockHolder -> packetBlockHolder.isViewer(player)) |
| 75 | + .forEach(packetBlock -> packetBlock.removeViewer(player)); |
| 76 | + |
| 77 | + manager.getBlocks(event.getPlayer().getWorld()).stream() |
| 78 | + .filter(PacketBlockHolder::isAddViewerOnJoin) |
| 79 | + .forEach(packetBlock -> { |
| 80 | + if (packetBlock instanceof PacketBlock singleBlock) { |
| 81 | + singleBlock.attemptAddViewer(player, false) |
| 82 | + .ifPresent(pd -> states.add(((PacketBlock) packetBlock).getBlockState(player))); |
| 83 | + return; |
| 84 | + } |
| 85 | + |
| 86 | + if (!(packetBlock instanceof PacketBlockGroup group)) { |
| 87 | + return; |
| 88 | + } |
| 89 | + |
| 90 | + group.attemptAddViewer(player, false).ifPresent(pd -> states.addAll(group.getBlockStates(player))); |
| 91 | + }); |
| 92 | + |
| 93 | + player.sendBlockChanges(states); |
| 94 | + } |
| 95 | + |
67 | 96 | @EventHandler |
68 | 97 | public void onQuit(PlayerQuitEvent event) { |
69 | 98 | Player player = event.getPlayer(); |
|
0 commit comments