Mirrors/Purpur
1
0
Fork 1
mirror of https://github.com/PurpurMC/Purpur.git synced 2026-02-18 08:57:44 +01:00
Code Issues Packages Projects Releases Wiki Activity

we compile

Browse Source
This commit is contained in:
Ben Kerllenevich
2022-06-08 13:45:48 -04:00
parent 856416cca4
commit 6268dc4452
10 changed files with 39 additions and 97 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
patches/server/0005-Ridables.patch
View File

@@ -79,7 +79,7 @@ index a7bc4eefd73337bfabb84032cd98aba42f5870fd..076c482e6844f6a188267556cd8fbcc5
if ((entity instanceof Bucketable && entity instanceof LivingEntity && origItem != null && origItem.asItem() == Items.WATER_BUCKET) && (event.isCancelled() || ServerGamePacketListenerImpl.this.player.getInventory().getSelected() == null || ServerGamePacketListenerImpl.this.player.getInventory().getSelected().getItem() != origItem)) {
ServerGamePacketListenerImpl.this.send(new ClientboundAddEntityPacket(entity));
diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
index 4ac33be263c3380a1ccc01affe3e20d46badd46e..4b01ef01efe128cdeac548c592f62d72c9e0169e 100644
index 2c42e2c39a13372833a4ba9a027e0315b150ab6c..f3c2cec6cef8f372cb56c28f985bce090bca2be0 100644
--- a/src/main/java/net/minecraft/world/entity/Entity.java
+++ b/src/main/java/net/minecraft/world/entity/Entity.java
@@ -356,7 +356,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
@@ -119,7 +119,7 @@ index 4ac33be263c3380a1ccc01affe3e20d46badd46e..4b01ef01efe128cdeac548c592f62d72
if (this.passengers.size() == 1 && this.passengers.get(0) == entity) {
this.passengers = ImmutableList.of();
} else {
@@ -4431,4 +4445,45 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
@@ -4417,4 +4431,45 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
return ((ServerChunkCache) level.getChunkSource()).isPositionTicking(this);
}
// Paper end
@@ -272,7 +272,7 @@ index 32b0603063032677d734a1c173677f544ce7cc5c..52086efc539b854c159d5166e33b49d9
// Paper end
if (!this.level.isClientSide && this.isSensitiveToWater() && this.isInWaterRainOrBubble()) {
diff --git a/src/main/java/net/minecraft/world/entity/Mob.java b/src/main/java/net/minecraft/world/entity/Mob.java
index a55c30d86793bf224b536a7ceefce75c70b618c7..fdb8f0bb0996dec6724066ae6de103131fdde6a1 100644
index a55c30d86793bf224b536a7ceefce75c70b618c7..a6217bc88e3a9d302e2ce8d453170017c8cfaf54 100644
--- a/src/main/java/net/minecraft/world/entity/Mob.java
+++ b/src/main/java/net/minecraft/world/entity/Mob.java
@@ -146,8 +146,8 @@ public abstract class Mob extends LivingEntity {
@@ -335,7 +335,7 @@ index a55c30d86793bf224b536a7ceefce75c70b618c7..fdb8f0bb0996dec6724066ae6de10313
+ }
+ }
+ if (!player.getBukkitEntity().hasPermission("allow.ride." + getType().id)) {
+ player.sendMessage(org.purpurmc.purpur.PurpurConfig.cannotRideMob);
+ player.sendMiniMessage(org.purpurmc.purpur.PurpurConfig.cannotRideMob);
+ return InteractionResult.PASS;
+ }
+ player.setYRot(this.getYRot());