51 lines
3.9 KiB
Diff
51 lines
3.9 KiB
Diff
--- a/net/minecraft/world/level/gameevent/vibrations/VibrationSystem.java
|
|
+++ b/net/minecraft/world/level/gameevent/vibrations/VibrationSystem.java
|
|
@@ -31,6 +31,12 @@
|
|
import net.minecraft.world.phys.MovingObjectPosition;
|
|
import net.minecraft.world.phys.Vec3D;
|
|
|
|
+// CraftBukkit start
|
|
+import org.bukkit.craftbukkit.CraftGameEvent;
|
|
+import org.bukkit.craftbukkit.block.CraftBlock;
|
|
+import org.bukkit.event.block.BlockReceiveGameEvent;
|
|
+// CraftBukkit end
|
|
+
|
|
public interface VibrationSystem {
|
|
|
|
List<ResourceKey<GameEvent>> RESONANCE_EVENTS = List.of(GameEvent.RESONATE_1.key(), GameEvent.RESONATE_2.key(), GameEvent.RESONATE_3.key(), GameEvent.RESONATE_4.key(), GameEvent.RESONATE_5.key(), GameEvent.RESONATE_6.key(), GameEvent.RESONATE_7.key(), GameEvent.RESONATE_8.key(), GameEvent.RESONATE_9.key(), GameEvent.RESONATE_10.key(), GameEvent.RESONATE_11.key(), GameEvent.RESONATE_12.key(), GameEvent.RESONATE_13.key(), GameEvent.RESONATE_14.key(), GameEvent.RESONATE_15.key());
|
|
@@ -112,7 +118,7 @@
|
|
return instance.group(VibrationInfo.CODEC.lenientOptionalFieldOf("event").forGetter((vibrationsystem_a) -> {
|
|
return Optional.ofNullable(vibrationsystem_a.currentVibration);
|
|
}), VibrationSelector.CODEC.fieldOf("selector").forGetter(VibrationSystem.a::getSelectionStrategy), ExtraCodecs.NON_NEGATIVE_INT.fieldOf("event_delay").orElse(0).forGetter(VibrationSystem.a::getTravelTimeInTicks)).apply(instance, (optional, vibrationselector, integer) -> {
|
|
- return new VibrationSystem.a((VibrationInfo) optional.orElse((Object) null), vibrationselector, integer, true);
|
|
+ return new VibrationSystem.a((VibrationInfo) optional.orElse(null), vibrationselector, integer, true); // CraftBukkit- decompile error
|
|
});
|
|
});
|
|
public static final String NBT_TAG_KEY = "listener";
|
|
@@ -202,7 +208,14 @@
|
|
} else {
|
|
Vec3D vec3d1 = (Vec3D) optional.get();
|
|
|
|
- if (!vibrationsystem_d.canReceiveVibration(worldserver, BlockPosition.containing(vec3d), holder, gameevent_a)) {
|
|
+ // CraftBukkit start
|
|
+ boolean defaultCancel = !vibrationsystem_d.canReceiveVibration(worldserver, BlockPosition.containing(vec3d), holder, gameevent_a);
|
|
+ Entity entity = gameevent_a.sourceEntity();
|
|
+ BlockReceiveGameEvent event = new BlockReceiveGameEvent(CraftGameEvent.minecraftToBukkit(holder.value()), CraftBlock.at(worldserver, BlockPosition.containing(vec3d1)), (entity == null) ? null : entity.getBukkitEntity());
|
|
+ event.setCancelled(defaultCancel);
|
|
+ worldserver.getCraftServer().getPluginManager().callEvent(event);
|
|
+ if (event.isCancelled()) {
|
|
+ // CraftBukkit end
|
|
return false;
|
|
} else if (isOccluded(worldserver, vec3d, vec3d1)) {
|
|
return false;
|
|
@@ -314,7 +327,8 @@
|
|
if (vibrationsystem_d.requiresAdjacentChunksToBeTicking() && !areAdjacentChunksTicking(worldserver, blockposition1)) {
|
|
return false;
|
|
} else {
|
|
- vibrationsystem_d.onReceiveVibration(worldserver, blockposition, vibrationinfo.gameEvent(), (Entity) vibrationinfo.getEntity(worldserver).orElse((Object) null), (Entity) vibrationinfo.getProjectileOwner(worldserver).orElse((Object) null), VibrationSystem.b.distanceBetweenInBlocks(blockposition, blockposition1));
|
|
+ // CraftBukkit - decompile error
|
|
+ vibrationsystem_d.onReceiveVibration(worldserver, blockposition, vibrationinfo.gameEvent(), (Entity) vibrationinfo.getEntity(worldserver).orElse(null), (Entity) vibrationinfo.getProjectileOwner(worldserver).orElse(null), VibrationSystem.b.distanceBetweenInBlocks(blockposition, blockposition1));
|
|
vibrationsystem_a.setCurrentVibration((VibrationInfo) null);
|
|
return true;
|
|
}
|