mirror of
https://github.com/LeavesMC/Leaves.git
synced 2025-12-22 08:29:22 +00:00
41 lines
2.3 KiB
Diff
41 lines
2.3 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 8078f127ff4b6e0aafb5804b9c02e237f79445b5..801f066878d6ffe5dabe01d20513db9022b323ec 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
|
|
/*
|
|
@@ -162,7 +162,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);
|
|
diff --git a/src/main/java/top/leavesmc/leaves/LeavesConfig.java b/src/main/java/top/leavesmc/leaves/LeavesConfig.java
|
|
index 3573a86cf287d01cb3f8ca195d8a8de2df9e981f..62c7e7e2a655a3b06dd8b2b1bb41aa981e40a812 100644
|
|
--- a/src/main/java/top/leavesmc/leaves/LeavesConfig.java
|
|
+++ b/src/main/java/top/leavesmc/leaves/LeavesConfig.java
|
|
@@ -849,6 +849,7 @@ public final class LeavesConfig {
|
|
|
|
public static void registerLeavesFeatures() {
|
|
LeavesFeatureSet.register(LeavesFeature.of("mspt_sync", msptSyncProtocol));
|
|
+ LeavesFeatureSet.register(LeavesFeature.of("lava_riptide", lavaRiptide));
|
|
}
|
|
|
|
public static boolean hopperCounter = false;
|