Upstream/Minestom
1
0
Fork 0
mirror of https://github.com/Minestom/Minestom.git synced 2024-09-27 14:13:24 +02:00
Code Issues Projects Releases Wiki Activity

Added BlockHandler#handleContact

Browse Source
This commit is contained in:
TheMode 2021-05-29 00:55:24 +02:00
parent d937660cf8
commit ba892ced05
2 changed files with 26 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
src/main/java/net/minestom/server/entity/Entity.java
View File

@ -23,6 +23,8 @@ import net.minestom.server.event.handler.EventHandler;
import net.minestom.server.instance.Chunk;
import net.minestom.server.instance.Instance;
import net.minestom.server.instance.InstanceManager;
import net.minestom.server.instance.block.Block;
import net.minestom.server.instance.block.BlockHandler;
import net.minestom.server.network.packet.server.play.*;
import net.minestom.server.network.player.PlayerConnection;
import net.minestom.server.permission.Permission;
@ -618,19 +620,18 @@ public class Entity implements Viewable, Tickable, EventHandler, DataContainer,
continue;
}
// TODO: Handle Block Contact with custom Block
// old code: feel free to remove:
// final CustomBlock customBlock = null;//chunk.getCustomBlock(x, y, z);
// if (customBlock != null) {
// tmpPosition.setX(x);
// tmpPosition.setY(y);
// tmpPosition.setZ(z);
// // checks that we are actually in the block, and not just here because of a rounding error
// if (boundingBox.intersect(tmpPosition)) {
// // TODO: replace with check with custom block bounding box
// customBlock.handleContact(instance, tmpPosition, this);
// }
// }
final Block block = chunk.getBlock(x, y, z);
final BlockHandler handler = block.getHandler();
if (handler != null) {
tmpPosition.setX(x);
tmpPosition.setY(y);
tmpPosition.setZ(z);
// checks that we are actually in the block, and not just here because of a rounding error
if (boundingBox.intersect(tmpPosition)) {
// TODO: replace with check with custom block bounding box
handler.handleContact(instance, block, tmpPosition, this);
}
}
}
}
}

12
src/main/java/net/minestom/server/instance/block/BlockHandler.java
View File

@ -1,5 +1,6 @@
package net.minestom.server.instance.block;
import net.minestom.server.entity.Entity;
import net.minestom.server.entity.Player;
import net.minestom.server.instance.Instance;
import net.minestom.server.utils.BlockPosition;
@ -53,6 +54,17 @@ public interface BlockHandler {
return 0.5f;
}
/**
* Defines custom behaviour for entities touching this block.
*
* @param instance the instance
* @param block the block
* @param position the position at which the block is
* @param touching the entity currently touching the block
*/
default void handleContact(@NotNull Instance instance, @NotNull Block block, @NotNull BlockPosition position, @NotNull Entity touching) {
}
/**
* Gets the id of this handler.
* <p>