Skip to content

Add EntityTouchWaterEvent #13551

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

Add EntityTouchWaterEvent #13551

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f555f29
Add EntityTouchWaterEvent
Cryptite Jan 15, 2026
2578b14
Add EntityTouchWaterEvent
Cryptite Jan 15, 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
40 changes: 40 additions & 0 deletions paper-api/src/main/java/io/papermc/paper/event/entity/EntityTouchWaterEvent.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,40 @@
package io.papermc.paper.event.entity;

import org.bukkit.entity.Entity;
import org.bukkit.event.HandlerList;
import org.bukkit.event.entity.EntityEvent;
import org.jetbrains.annotations.ApiStatus;
import org.jspecify.annotations.NullMarked;

/**
* Event when an Entity starts touching water or not. This includes even small amounts of flowing water.
*/
@NullMarked
public class EntityTouchWaterEvent extends EntityEvent{
Copy link
Contributor

@lynxplay lynxplay Jan 15, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Naming feels very confusing.
EntityTouchWaterEvent for when an entity doesn't touch water feels kinda rough.
Formatting also also off here, missing space after EntityEvent.

What prevents us from just having two events for this?


private static final HandlerList HANDLER_LIST = new HandlerList();

private boolean inWater;

@ApiStatus.Internal
public EntityTouchWaterEvent(final Entity entity, final boolean inWater) {
super(entity);
this.inWater = inWater;
}

/**
* @return If the entity is now touching water.
*/
public boolean isInWater() {
return inWater;
}

@Override
public HandlerList getHandlers() {
return HANDLER_LIST;
}

public static HandlerList getHandlerList() {
return HANDLER_LIST;
}
}
24 changes: 24 additions & 0 deletions paper-server/patches/features/0032-Add-EntityTouchWaterEvent.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Cryptite <cryptite@gmail.com>
Date: Wed, 14 Jan 2026 21:13:11 -0600
Subject: [PATCH] Add EntityTouchWaterEvent


diff --git a/net/minecraft/world/entity/Entity.java b/net/minecraft/world/entity/Entity.java
index 3bf618f1d756bad7755a87803132bd731e7c41be..de4fde4bb4164cd009edc7c5273dc10d60418209 100644
--- a/net/minecraft/world/entity/Entity.java
+++ b/net/minecraft/world/entity/Entity.java
@@ -2044,11 +2044,13 @@ public abstract class Entity implements SyncedDataHolder, DebugValueSource, Name
} else if (this.updateFluidHeightAndDoFluidPushing(FluidTags.WATER, 0.014)) {
if (!this.wasTouchingWater && !this.firstTick) {
this.doWaterSplashEffect();
+ new io.papermc.paper.event.entity.EntityTouchWaterEvent(getBukkitEntity(), true).callEvent(); // Paper
}

this.resetFallDistance();
this.wasTouchingWater = true;
} else {
+ if (this.wasTouchingWater) new io.papermc.paper.event.entity.EntityTouchWaterEvent(getBukkitEntity(), false).callEvent(); // Paper
this.wasTouchingWater = false;
}
}
Loading