-
-
Notifications
You must be signed in to change notification settings - Fork 40
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Fix tick issue and two mc-old features (#239)
- Loading branch information
1 parent
5a03bd3
commit 65deeff
Showing
8 changed files
with
67 additions
and
26 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,28 @@ | ||
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 | ||
From: Lumine1909 <133463833+Lumine1909@users.noreply.github.com> | ||
Date: Wed, 26 Jun 2024 17:59:56 +0800 | ||
Subject: [PATCH] Allow grindstone overstacking | ||
|
||
|
||
diff --git a/src/main/java/net/minecraft/world/inventory/GrindstoneMenu.java b/src/main/java/net/minecraft/world/inventory/GrindstoneMenu.java | ||
index 1678f6c8b2c7db761783e53043169bf12bc2cb29..13cfda7c065e0332133a1e1b60b454ae44e87d35 100644 | ||
--- a/src/main/java/net/minecraft/world/inventory/GrindstoneMenu.java | ||
+++ b/src/main/java/net/minecraft/world/inventory/GrindstoneMenu.java | ||
@@ -202,7 +202,7 @@ public class GrindstoneMenu extends AbstractContainerMenu { | ||
byte b0 = 1; | ||
|
||
if (!firstInput.isDamageableItem()) { | ||
- if (firstInput.getMaxStackSize() < 2 || !ItemStack.matches(firstInput, secondInput)) { | ||
+ if (!org.leavesmc.leaves.LeavesConfig.allowGrindstoneOverstacking && firstInput.getMaxStackSize() < 2 || !ItemStack.matches(firstInput, secondInput)) { // Leaves - allowGrindstoneOverstaking | ||
return ItemStack.EMPTY; | ||
} | ||
|
||
@@ -286,7 +286,7 @@ public class GrindstoneMenu extends AbstractContainerMenu { | ||
ItemStack itemstack3 = this.repairSlots.getItem(1); | ||
|
||
if (slot == 2) { | ||
- if (!this.moveItemStackTo(itemstack1, 3, 39, true)) { | ||
+ if (!this.moveItemStackTo(itemstack1, 3, 39, true, org.leavesmc.leaves.LeavesConfig.allowGrindstoneOverstacking)) { // Leaves - allowGrindstoneOverstacking: Disable stack check | ||
return ItemStack.EMPTY; | ||
} | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,19 @@ | ||
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 | ||
From: Lumine1909 <133463833+Lumine1909@users.noreply.github.com> | ||
Date: Wed, 26 Jun 2024 18:15:57 +0800 | ||
Subject: [PATCH] Configurable MC-67 | ||
|
||
|
||
diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java | ||
index b450c19fbb6cc7266db4ddc4bc86546ca2054d5a..64356adabfab88e76a1df9c1ff4d9112e61e8b09 100644 | ||
--- a/src/main/java/net/minecraft/world/entity/Entity.java | ||
+++ b/src/main/java/net/minecraft/world/entity/Entity.java | ||
@@ -3753,7 +3753,7 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess | ||
} | ||
|
||
public boolean canChangeDimensions(Level from, Level to) { | ||
- return this.isAlive() && this.valid; // Paper - Fix item duplication and teleport issues | ||
+ return !(!org.leavesmc.leaves.LeavesConfig.allowEntityPortalWithPassenger && (this.isPassenger() || this.isVehicle())) && this.isAlive() && this.valid; // Paper - Fix item duplication and teleport issues // Leaves - allowEntityPortalWithPassenger | ||
} | ||
|
||
public float getBlockExplosionResistance(Explosion explosion, BlockGetter world, BlockPos pos, BlockState blockState, FluidState fluidState, float max) { |