port Ridables patches

This commit is contained in:
granny
2025-01-04 01:27:30 -08:00
committed by granny
parent df947a7e81
commit b739a95b1e
24 changed files with 2633 additions and 2759 deletions

View File

@@ -0,0 +1,38 @@
--- a/src/main/java/org/bukkit/entity/Entity.java
+++ b/src/main/java/org/bukkit/entity/Entity.java
@@ -1172,4 +_,35 @@
*/
void broadcastHurtAnimation(@NotNull java.util.Collection<Player> players);
// Paper end - broadcast hurt animation
+
+ // Purpur start - Ridables
+ /**
+ * Get the riding player
+ *
+ * @return Riding player
+ */
+ @Nullable
+ Player getRider();
+
+ /**
+ * Check if entity is being ridden
+ *
+ * @return True if being ridden
+ */
+ boolean hasRider();
+
+ /**
+ * Check if entity is ridable
+ *
+ * @return True if ridable
+ */
+ boolean isRidable();
+
+ /**
+ * Check if entity is ridable in water
+ *
+ * @return True if ridable in water
+ */
+ boolean isRidableInWater();
+ // Purpur end - Ridables
}

View File

@@ -0,0 +1,100 @@
package org.purpurmc.purpur.event.entity;
import com.google.common.base.Preconditions;
import org.bukkit.Location;
import org.bukkit.entity.Mob;
import org.bukkit.entity.Player;
import org.bukkit.event.Cancellable;
import org.bukkit.event.HandlerList;
import org.bukkit.event.entity.EntityEvent;
import org.jetbrains.annotations.ApiStatus;
import org.jspecify.annotations.NullMarked;
/**
* Triggered when a ridable mob moves with a rider
*/
@NullMarked
public class RidableMoveEvent extends EntityEvent implements Cancellable {
private static final HandlerList handlers = new HandlerList();
private boolean canceled;
private final Player rider;
private Location from;
private Location to;
@ApiStatus.Internal
public RidableMoveEvent(Mob entity, Player rider, Location from, Location to) {
super(entity);
this.rider = rider;
this.from = from;
this.to = to;
}
@Override
public Mob getEntity() {
return (Mob) entity;
}
public Player getRider() {
return rider;
}
public boolean isCancelled() {
return canceled;
}
public void setCancelled(boolean cancel) {
canceled = cancel;
}
/**
* Gets the location this entity moved from
*
* @return Location the entity moved from
*/
public Location getFrom() {
return from;
}
/**
* Sets the location to mark as where the entity moved from
*
* @param from New location to mark as the entity's previous location
*/
public void setFrom(Location from) {
validateLocation(from);
this.from = from;
}
/**
* Gets the location this entity moved to
*
* @return Location the entity moved to
*/
public Location getTo() {
return to;
}
/**
* Sets the location that this entity will move to
*
* @param to New Location this entity will move to
*/
public void setTo(Location to) {
validateLocation(to);
this.to = to;
}
private void validateLocation(Location loc) {
Preconditions.checkArgument(loc != null, "Cannot use null location!");
Preconditions.checkArgument(loc.getWorld() != null, "Cannot use null location with null world!");
}
@Override
public HandlerList getHandlers() {
return handlers;
}
public static HandlerList getHandlerList() {
return handlers;
}
}

View File

@@ -0,0 +1,38 @@
package org.purpurmc.purpur.event.entity;
import org.bukkit.entity.Entity;
import org.bukkit.event.Cancellable;
import org.bukkit.event.HandlerList;
import org.bukkit.event.entity.EntityEvent;
import org.jetbrains.annotations.ApiStatus;
import org.jspecify.annotations.NullMarked;
@NullMarked
public class RidableSpacebarEvent extends EntityEvent implements Cancellable {
private static final HandlerList handlers = new HandlerList();
private boolean cancelled;
@ApiStatus.Internal
public RidableSpacebarEvent(Entity entity) {
super(entity);
}
@Override
public boolean isCancelled() {
return cancelled;
}
@Override
public void setCancelled(boolean cancel) {
cancelled = cancel;
}
@Override
public HandlerList getHandlers() {
return handlers;
}
public static HandlerList getHandlerList() {
return handlers;
}
}

View File

@@ -29,6 +29,22 @@ public final class PurpurPermissions {
public static Permission registerPermissions() {
Permission purpur = DefaultPermissions.registerPermission(ROOT, "Gives the user the ability to use all Purpur utilities and commands", PermissionDefault.FALSE);
Permission ride = DefaultPermissions.registerPermission("allow.ride", "Allows the user to ride all mobs", PermissionDefault.FALSE, purpur);
for (String mob : mobs) {
DefaultPermissions.registerPermission("allow.ride." + mob, "Allows the user to ride " + mob, PermissionDefault.FALSE, ride);
}
ride.recalculatePermissibles();
Permission special = DefaultPermissions.registerPermission("allow.special", "Allows the user to use all mobs special abilities", PermissionDefault.FALSE, purpur);
for (String mob : mobs) {
DefaultPermissions.registerPermission("allow.special." + mob, "Allows the user to use " + mob + " special ability", PermissionDefault.FALSE, special);
}
special.recalculatePermissibles();
Permission powered = DefaultPermissions.registerPermission("allow.powered", "Allows the user to toggle all mobs powered state", PermissionDefault.FALSE, purpur);
DefaultPermissions.registerPermission("allow.powered.creeper", "Allows the user to toggle creeper powered state", PermissionDefault.FALSE, powered);
powered.recalculatePermissibles();
purpur.recalculatePermissibles();
return purpur;
}