Mirror von
https://github.com/GeyserMC/Geyser.git
synchronisiert 2024-10-05 09:20:07 +02:00
Fix StackOverflow possibility with undead horses
Dieser Commit ist enthalten in:
Ursprung
0fd903e0a0
Commit
e163301d23
@ -130,6 +130,11 @@ public class AbstractHorseEntity extends AnimalEntity {
|
|||||||
@Nonnull
|
@Nonnull
|
||||||
@Override
|
@Override
|
||||||
protected InteractiveTag testMobInteraction(@Nonnull GeyserItemStack itemInHand) {
|
protected InteractiveTag testMobInteraction(@Nonnull GeyserItemStack itemInHand) {
|
||||||
|
return testHorseInteraction(itemInHand);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Nonnull
|
||||||
|
protected InteractiveTag testHorseInteraction(@Nonnull GeyserItemStack itemInHand) {
|
||||||
boolean isBaby = isBaby();
|
boolean isBaby = isBaby();
|
||||||
if (!isBaby) {
|
if (!isBaby) {
|
||||||
if (getFlag(EntityFlag.TAMED) && session.isSneaking()) {
|
if (getFlag(EntityFlag.TAMED) && session.isSneaking()) {
|
||||||
@ -175,6 +180,11 @@ public class AbstractHorseEntity extends AnimalEntity {
|
|||||||
@Nonnull
|
@Nonnull
|
||||||
@Override
|
@Override
|
||||||
protected InteractionResult mobInteract(@Nonnull GeyserItemStack itemInHand) {
|
protected InteractionResult mobInteract(@Nonnull GeyserItemStack itemInHand) {
|
||||||
|
return mobHorseInteract(itemInHand);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Nonnull
|
||||||
|
protected final InteractionResult mobHorseInteract(@Nonnull GeyserItemStack itemInHand) {
|
||||||
boolean isBaby = isBaby();
|
boolean isBaby = isBaby();
|
||||||
if (!isBaby) {
|
if (!isBaby) {
|
||||||
if (getFlag(EntityFlag.TAMED) && session.isSneaking()) {
|
if (getFlag(EntityFlag.TAMED) && session.isSneaking()) {
|
||||||
@ -243,11 +253,11 @@ public class AbstractHorseEntity extends AnimalEntity {
|
|||||||
if (!getFlag(EntityFlag.TAMED)) {
|
if (!getFlag(EntityFlag.TAMED)) {
|
||||||
return InteractiveTag.NONE;
|
return InteractiveTag.NONE;
|
||||||
} else if (isBaby()) {
|
} else if (isBaby()) {
|
||||||
return testMobInteraction(itemInHand);
|
return testHorseInteraction(itemInHand);
|
||||||
} else if (session.isSneaking()) {
|
} else if (session.isSneaking()) {
|
||||||
return InteractiveTag.OPEN_CONTAINER;
|
return InteractiveTag.OPEN_CONTAINER;
|
||||||
} else if (!passengers.isEmpty()) {
|
} else if (!passengers.isEmpty()) {
|
||||||
return testMobInteraction(itemInHand);
|
return testHorseInteraction(itemInHand);
|
||||||
} else {
|
} else {
|
||||||
if (session.getItemMappings().getStoredItems().saddle() == itemInHand.getJavaId()) {
|
if (session.getItemMappings().getStoredItems().saddle() == itemInHand.getJavaId()) {
|
||||||
return InteractiveTag.OPEN_CONTAINER;
|
return InteractiveTag.OPEN_CONTAINER;
|
||||||
@ -265,12 +275,12 @@ public class AbstractHorseEntity extends AnimalEntity {
|
|||||||
if (!getFlag(EntityFlag.TAMED)) {
|
if (!getFlag(EntityFlag.TAMED)) {
|
||||||
return InteractionResult.PASS;
|
return InteractionResult.PASS;
|
||||||
} else if (isBaby()) {
|
} else if (isBaby()) {
|
||||||
return mobInteract(itemInHand);
|
return mobHorseInteract(itemInHand);
|
||||||
} else if (session.isSneaking()) {
|
} else if (session.isSneaking()) {
|
||||||
// Opens inventory
|
// Opens inventory
|
||||||
return InteractionResult.SUCCESS;
|
return InteractionResult.SUCCESS;
|
||||||
} else if (!passengers.isEmpty()) {
|
} else if (!passengers.isEmpty()) {
|
||||||
return mobInteract(itemInHand);
|
return mobHorseInteract(itemInHand);
|
||||||
} else {
|
} else {
|
||||||
// The client tests for saddle but it doesn't matter for us at this point.
|
// The client tests for saddle but it doesn't matter for us at this point.
|
||||||
return InteractionResult.SUCCESS;
|
return InteractionResult.SUCCESS;
|
||||||
|
Laden…
In neuem Issue referenzieren
Einen Benutzer sperren