mirror of
https://github.com/LeavesMC/Leaves.git
synced 2025-12-29 03:49:10 +00:00
29 lines
1.7 KiB
Diff
29 lines
1.7 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: violetc <58360096+s-yh-china@users.noreply.github.com>
|
|
Date: Fri, 7 Jul 2023 16:53:32 +0800
|
|
Subject: [PATCH] Lava riptide
|
|
|
|
|
|
diff --git a/src/main/java/net/minecraft/world/item/TridentItem.java b/src/main/java/net/minecraft/world/item/TridentItem.java
|
|
index a792c7b7a6179aa88fc473b27ef0ca13bd91a395..95318fe882bc65d1483c7547b41e6f660c0c0012 100644
|
|
--- a/src/main/java/net/minecraft/world/item/TridentItem.java
|
|
+++ b/src/main/java/net/minecraft/world/item/TridentItem.java
|
|
@@ -66,7 +66,7 @@ public class TridentItem extends Item implements Vanishable {
|
|
if (j >= 10) {
|
|
int k = EnchantmentHelper.getRiptide(stack);
|
|
|
|
- if (k <= 0 || entityhuman.isInWaterOrRain()) {
|
|
+ if (k <= 0 || entityhuman.isInWaterOrRain() || (top.leavesmc.leaves.LeavesConfig.lavaRiptide && entityhuman.isInLava())) { // Leaves - lava riptide
|
|
if (!world.isClientSide) {
|
|
// CraftBukkit - moved down
|
|
/*
|
|
@@ -160,7 +160,7 @@ public class TridentItem extends Item implements Vanishable {
|
|
|
|
if (itemstack.getDamageValue() >= itemstack.getMaxDamage() - 1) {
|
|
return InteractionResultHolder.fail(itemstack);
|
|
- } else if (EnchantmentHelper.getRiptide(itemstack) > 0 && !user.isInWaterOrRain()) {
|
|
+ } else if (EnchantmentHelper.getRiptide(itemstack) > 0 && !user.isInWaterOrRain() && !(top.leavesmc.leaves.LeavesConfig.lavaRiptide && user.isInLava())) { // Leaves - lava riptide
|
|
return InteractionResultHolder.fail(itemstack);
|
|
} else {
|
|
user.startUsingItem(hand);
|