mirrors/CC-Tweaked
1
0
Fork 0
mirror of https://github.com/SquidDev-CC/CC-Tweaked synced 2025-09-06 12:27:56 +00:00
Code Issues Releases Wiki Activity

fix potential bug

Browse Source 
Signed-off-by: Devan-Kerman <devan@cleverpath.com>
This commit is contained in:
Devan-Kerman
2020-09-09 10:07:38 -05:00
parent 0c45112262
commit 5184883af1
2 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/dan200/computercraft/shared/turtle/core/TurtlePlaceCommand.java
View File

@@ -230,7 +230,7 @@ public class TurtlePlaceCommand implements ITurtleCommand {
if (cancelResult != null && cancelResult.isAccepted()) { if (cancelResult != null && cancelResult.isAccepted()) {
placed = true; placed = true;
} else { } else if (hitEntity instanceof LivingEntity) {
// See EntityPlayer.interactOn // See EntityPlayer.interactOn
cancelResult = stackCopy.useOnEntity(turtlePlayer, (LivingEntity) hitEntity, Hand.MAIN_HAND); cancelResult = stackCopy.useOnEntity(turtlePlayer, (LivingEntity) hitEntity, Hand.MAIN_HAND);
if (cancelResult != null && cancelResult.isAccepted()) { if (cancelResult != null && cancelResult.isAccepted()) {
@@ -238,7 +238,7 @@ public class TurtlePlaceCommand implements ITurtleCommand {
} else if (cancelResult == null) { } else if (cancelResult == null) {
if (hitEntity.interact(turtlePlayer, Hand.MAIN_HAND) == ActionResult.CONSUME) { if (hitEntity.interact(turtlePlayer, Hand.MAIN_HAND) == ActionResult.CONSUME) {
placed = true; placed = true;
} else if (hitEntity instanceof LivingEntity) { } else {
placed = stackCopy.useOnEntity(turtlePlayer, (LivingEntity) hitEntity, Hand.MAIN_HAND) placed = stackCopy.useOnEntity(turtlePlayer, (LivingEntity) hitEntity, Hand.MAIN_HAND)
.isAccepted(); .isAccepted();
if (placed) { if (placed) {

2
src/main/java/dan200/computercraft/shared/turtle/core/TurtlePlayer.java
View File

@@ -26,12 +26,14 @@ import net.minecraft.entity.Entity;
import net.minecraft.entity.EntityDimensions; import net.minecraft.entity.EntityDimensions;
import net.minecraft.entity.EntityPose; import net.minecraft.entity.EntityPose;
import net.minecraft.entity.EntityType; import net.minecraft.entity.EntityType;
import net.minecraft.entity.LivingEntity;
import net.minecraft.entity.effect.StatusEffectInstance; import net.minecraft.entity.effect.StatusEffectInstance;
import net.minecraft.entity.passive.HorseBaseEntity; import net.minecraft.entity.passive.HorseBaseEntity;
import net.minecraft.inventory.Inventory; import net.minecraft.inventory.Inventory;
import net.minecraft.item.ItemStack; import net.minecraft.item.ItemStack;
import net.minecraft.screen.NamedScreenHandlerFactory; import net.minecraft.screen.NamedScreenHandlerFactory;
import net.minecraft.server.world.ServerWorld; import net.minecraft.server.world.ServerWorld;
import net.minecraft.util.ActionResult;
import net.minecraft.util.Hand; import net.minecraft.util.Hand;
import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.BlockPos;
import net.minecraft.util.math.Direction; import net.minecraft.util.math.Direction;