Update to Minecraft 1.17.1 (#6097)
This commit is contained in:
parent
a831634d44
commit
56fd1a2f84
266 changed files with 1415 additions and 1491 deletions
|
@ -5,10 +5,10 @@ Subject: [PATCH] Add dropLeash variable to EntityUnleashEvent
|
|||
|
||||
|
||||
diff --git a/src/main/java/net/minecraft/world/entity/Mob.java b/src/main/java/net/minecraft/world/entity/Mob.java
|
||||
index 108c5871c2171f22a8e0db8c00bfcaa4438b6137..c4c5c35e37b793f3b74349ff03c0829f4913b91c 100644
|
||||
index eec836e5e66a7255a31f1e9311cdb4e9819c84b2..0ce0e7a923da812a02d9ab83607d3cc9c87047df 100644
|
||||
--- a/src/main/java/net/minecraft/world/entity/Mob.java
|
||||
+++ b/src/main/java/net/minecraft/world/entity/Mob.java
|
||||
@@ -1208,12 +1208,15 @@ public abstract class Mob extends LivingEntity {
|
||||
@@ -1209,12 +1209,15 @@ public abstract class Mob extends LivingEntity {
|
||||
return InteractionResult.PASS;
|
||||
} else if (this.getLeashHolder() == player) {
|
||||
// CraftBukkit start - fire PlayerUnleashEntityEvent
|
||||
|
@ -26,7 +26,7 @@ index 108c5871c2171f22a8e0db8c00bfcaa4438b6137..c4c5c35e37b793f3b74349ff03c0829f
|
|||
return InteractionResult.sidedSuccess(this.level.isClientSide);
|
||||
} else {
|
||||
InteractionResult enuminteractionresult = this.checkAndHandleImportantInteractions(player, hand);
|
||||
@@ -1371,8 +1374,11 @@ public abstract class Mob extends LivingEntity {
|
||||
@@ -1372,8 +1375,11 @@ public abstract class Mob extends LivingEntity {
|
||||
|
||||
if (this.leashHolder != null) {
|
||||
if (!this.isAlive() || !this.leashHolder.isAlive()) {
|
||||
|
@ -40,7 +40,7 @@ index 108c5871c2171f22a8e0db8c00bfcaa4438b6137..c4c5c35e37b793f3b74349ff03c0829f
|
|||
}
|
||||
|
||||
}
|
||||
@@ -1435,8 +1441,11 @@ public abstract class Mob extends LivingEntity {
|
||||
@@ -1436,8 +1442,11 @@ public abstract class Mob extends LivingEntity {
|
||||
boolean flag1 = super.startRiding(entity, force);
|
||||
|
||||
if (flag1 && this.isLeashed()) {
|
||||
|
@ -54,7 +54,7 @@ index 108c5871c2171f22a8e0db8c00bfcaa4438b6137..c4c5c35e37b793f3b74349ff03c0829f
|
|||
}
|
||||
|
||||
return flag1;
|
||||
@@ -1606,8 +1615,11 @@ public abstract class Mob extends LivingEntity {
|
||||
@@ -1607,8 +1616,11 @@ public abstract class Mob extends LivingEntity {
|
||||
@Override
|
||||
protected void removeAfterChangingDimensions() {
|
||||
super.removeAfterChangingDimensions();
|
||||
|
@ -122,7 +122,7 @@ index b9b67134f02fd7484ed19905c9ae1f9b8a26ce26..c05f173b7642380900fdd77ce5d2c020
|
|||
}
|
||||
}
|
||||
diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
|
||||
index fefb8ff3caff61d8ea2c52d5b280e5af03b76bbf..4991ee6671f73b446e5dff958427b10aac78c63a 100644
|
||||
index c2ddbde78c861c33f25c63483fc8928307161f1a..b4509c4a03b82d7c49329aa74087818499430e58 100644
|
||||
--- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
|
||||
+++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
|
||||
@@ -1466,8 +1466,10 @@ public class CraftEventFactory {
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue