mirror of
https://github.com/PurpurMC/Purpur.git
synced 2026-04-19 17:58:15 +02:00
d53e7784d6
Upstream has released updates that appear to apply and compile correctly Paper Changes: PaperMC/Paper@e4a5a894 Update to Minecraft 26.1.1 PaperMC/Paper@92a4d8db Update "Only write chunk data to disk if it serializes without throwing" PaperMC/Paper@02d9cbce Update "Entity load/save limit per chunk" PaperMC/Paper@cb696286 Update "Attempt to recalculate regionfile header if it is corrupt" PaperMC/Paper@4662bab9 Update "Incremental chunk and player saving" PaperMC/Paper@4dddc82f Implement new version schema: `<mcver>.build.<paper_build_no>-<paper_status>` / `<mcver>.local-SNAPSHOT` PaperMC/Paper@fc0a9980 Set channel to ALPHA PaperMC/Paper@a4fa0357 update gradle wrapper PaperMC/Paper@a15ceb7a Update fill-gradle to 1.0.11 PaperMC/Paper@52f7e24e Publish to releases repository PaperMC/Paper@bb7ff8f0 Update "Optimise general POI access" PaperMC/Paper@ac42a07e Update "Flush regionfiles on save configuration option" PaperMC/Paper@14357cc5 Avoid using the regionfile directory name to determine if it is chunk data PaperMC/Paper@a2f4d349 Update "Optimise collision checking in player move packet handling" PaperMC/Paper@50303a0e Update "Add explicit flush support to Log4j AsyncAppender" PaperMC/Paper@7bc4f895 Shift unapplied patches PaperMC/Paper@62ba2c4f Update "Improve keepalive ping system" PaperMC/Paper@f6d27019 Update "Optimise EntityScheduler ticking" PaperMC/Paper@4d8d06c7 Fix WorldBorder#setCenter ignoring new values on 26.1.1 (#13741) PaperMC/Paper@f9da8035 update unpick definitions PaperMC/Paper@fc71a133 [ci/skip] fixup previous commit PaperMC/Paper@4c91cd34 Lazy set Entity.projectileSource in AbstractProjectile#getShooter PaperMC/Paper@3d1da60c Cache the climbing check in activation range (#12764) PaperMC/Paper@575630f3 feat: Optimize ServerWaypointManager when locator bar is disabled PaperMC/Paper@742daf02 [ci/skip] fixup previous commit PaperMC/Paper@d29063da Rebuild patches PaperMC/Paper@ce581c3c Bump deps to match Vanilla versions (#13744) PaperMC/Paper@f3e9a934 Fix attack check PaperMC/Paper@b4743b58 Fix gamerule loading in Management Protocol (#13753) PaperMC/Paper@c53ac8a1 Add PlayerToggleEntityAgeLockEvent (#13742) PaperMC/Paper@59081719 fixup previous event PaperMC/Paper@7b49b586 Update "Optional per player mob spawns" PaperMC/Paper@1fae14c2 Update "Improve cancelling PreCreatureSpawnEvent with per player mob spawns" PaperMC/Paper@c40cb75b Update "Optimize Hoppers" PaperMC/Paper@edad1e4c Update "Anti-Xray" PaperMC/Paper@106a934d [ci/skip] Drop stale TODO PaperMC/Paper@77c0866f handle legacy uid in vanilla migration and always write metadata during migration
66 lines
2.8 KiB
Diff
66 lines
2.8 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: William Blake Galbreath <Blake.Galbreath@GMail.com>
|
|
Date: Sun, 5 Jul 2020 22:19:49 -0500
|
|
Subject: [PATCH] Ridables
|
|
|
|
|
|
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
|
|
index c5a866735d7d918ea58306ea2299a8b82be52f3f..d6ddbcff911ce4c97a20883af10d2b4752b63f55 100644
|
|
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
|
|
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
|
|
@@ -1343,4 +1343,26 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
|
|
return this.entity.get(io.papermc.paper.datacomponent.PaperDataComponentType.bukkitToMinecraft(type)) != null;
|
|
}
|
|
|
|
+ // Purpur start - Ridables
|
|
+ @Override
|
|
+ public org.bukkit.entity.Player getRider() {
|
|
+ net.minecraft.world.entity.player.Player rider = getHandle().getRider();
|
|
+ return rider != null ? (org.bukkit.entity.Player) rider.getBukkitEntity() : null;
|
|
+ }
|
|
+
|
|
+ @Override
|
|
+ public boolean hasRider() {
|
|
+ return getHandle().getRider() != null;
|
|
+ }
|
|
+
|
|
+ @Override
|
|
+ public boolean isRidable() {
|
|
+ return getHandle().isRidable();
|
|
+ }
|
|
+
|
|
+ @Override
|
|
+ public boolean isRidableInWater() {
|
|
+ return !getHandle().dismountsUnderwater();
|
|
+ }
|
|
+ // Purpur end - Ridables
|
|
}
|
|
diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
|
|
index 6d485bb4d91668070c28c3fe1dc2c4708760d924..631b8186f89e133936f9a55957fc3215e53184d1 100644
|
|
--- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
|
|
+++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
|
|
@@ -649,6 +649,15 @@ public class CraftEventFactory {
|
|
}
|
|
craftServer.getPluginManager().callEvent(event);
|
|
|
|
+ // Purpur start - Ridables
|
|
+ if (player != null) {
|
|
+ switch (action) {
|
|
+ case LEFT_CLICK_BLOCK, LEFT_CLICK_AIR -> player.processClick(InteractionHand.MAIN_HAND);
|
|
+ case RIGHT_CLICK_BLOCK, RIGHT_CLICK_AIR -> player.processClick(InteractionHand.OFF_HAND);
|
|
+ }
|
|
+ }
|
|
+ // Purpur end - Ridables
|
|
+
|
|
return event;
|
|
}
|
|
|
|
@@ -1161,6 +1170,7 @@ public class CraftEventFactory {
|
|
EntityDamageEvent event;
|
|
if (damager != null) {
|
|
event = new EntityDamageByEntityEvent(damager.getBukkitEntity(), damagee.getBukkitEntity(), cause, bukkitDamageSource, modifiers, modifierFunctions, critical);
|
|
+ damager.processClick(InteractionHand.MAIN_HAND); // Purpur - Ridables
|
|
} else {
|
|
event = new EntityDamageEvent(damagee.getBukkitEntity(), cause, bukkitDamageSource, modifiers, modifierFunctions);
|
|
}
|