Skip to content

Commit 48131f7

Browse files
committed
update nms file patches
1 parent cb8448f commit 48131f7

File tree

234 files changed

+854
-873
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

234 files changed

+854
-873
lines changed

purpur-server/minecraft-patches/rejected/net/minecraft/stats/ServerRecipeBook.java.patch

-10
This file was deleted.

purpur-server/minecraft-patches/rejected/net/minecraft/world/entity/ai/behavior/AcquirePoi.java.patch

-11
This file was deleted.

purpur-server/minecraft-patches/rejected/net/minecraft/world/entity/ai/sensing/NearestBedSensor.java.patch

-11
This file was deleted.

purpur-server/minecraft-patches/rejected/net/minecraft/world/entity/monster/ZombifiedPiglin.java.patch

-20
This file was deleted.

purpur-server/minecraft-patches/rejected/net/minecraft/world/entity/npc/CatSpawner.java.patch

-39
This file was deleted.

purpur-server/minecraft-patches/rejected/net/minecraft/world/entity/raid/Raids.java.patch

-42
This file was deleted.

purpur-server/minecraft-patches/rejected/net/minecraft/world/item/EggItem.java.patch

-11
This file was deleted.

purpur-server/minecraft-patches/rejected/net/minecraft/world/level/block/BubbleColumnBlock.java.patch

-15
This file was deleted.

purpur-server/minecraft-patches/rejected/net/minecraft/world/level/block/CampfireBlock.java.patch

-11
This file was deleted.

purpur-server/minecraft-patches/rejected/net/minecraft/world/level/block/SculkShriekerBlock.java.patch

-11
This file was deleted.

purpur-server/minecraft-patches/rejected/net/minecraft/world/level/levelgen/PhantomSpawner.java.patch

-32
This file was deleted.

purpur-server/minecraft-patches/rejected/net/minecraft/commands/CommandSourceStack.java.patch renamed to purpur-server/minecraft-patches/sources/net/minecraft/commands/CommandSourceStack.java.patch

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
public Vec3 getPosition() {
2121
return this.worldPosition;
2222
}
23-
@@ -540,6 +_,30 @@
23+
@@ -539,6 +_,30 @@
2424
}
2525
}
2626
}

purpur-server/minecraft-patches/rejected/net/minecraft/commands/Commands.java.patch renamed to purpur-server/minecraft-patches/sources/net/minecraft/commands/Commands.java.patch

+3-5
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,11 @@
11
--- a/net/minecraft/commands/Commands.java
22
+++ b/net/minecraft/commands/Commands.java
3-
@@ -221,8 +_,8 @@
3+
@@ -222,7 +_,7 @@
44
JfrCommand.register(this.dispatcher);
55
}
66

77
- if (SharedConstants.IS_RUNNING_IN_IDE) {
8-
- TestCommand.register(this.dispatcher);
98
+ if (org.purpurmc.purpur.PurpurConfig.registerMinecraftDebugCommands || SharedConstants.IS_RUNNING_IN_IDE) { // Purpur - register minecraft debug commands
10-
+ if (!org.purpurmc.purpur.PurpurConfig.registerMinecraftDebugCommands) TestCommand.register(this.dispatcher); // Purpur - register minecraft debug commands
119
RaidCommand.register(this.dispatcher, context);
1210
DebugPathCommand.register(this.dispatcher);
1311
DebugMobSpawningCommand.register(this.dispatcher);
@@ -26,15 +24,15 @@
2624
}
2725

2826
if (selection.includeIntegrated) {
29-
@@ -503,6 +_,7 @@
27+
@@ -502,6 +_,7 @@
3028
private void runSync(ServerPlayer player, java.util.Collection<String> bukkit, RootCommandNode<SharedSuggestionProvider> rootCommandNode) {
3129
// Paper end - Perf: Async command map building
3230
new com.destroystokyo.paper.event.brigadier.AsyncPlayerSendCommandsEvent<CommandSourceStack>(player.getBukkitEntity(), (RootCommandNode) rootCommandNode, true).callEvent(); // Paper - Brigadier API
3331
+ if (org.bukkit.event.player.PlayerCommandSendEvent.getHandlerList().getRegisteredListeners().length > 0) { // Purpur - Skip events if there's no listeners
3432
org.bukkit.event.player.PlayerCommandSendEvent event = new org.bukkit.event.player.PlayerCommandSendEvent(player.getBukkitEntity(), new java.util.LinkedHashSet<>(bukkit));
3533
event.getPlayer().getServer().getPluginManager().callEvent(event);
3634

37-
@@ -513,6 +_,7 @@
35+
@@ -512,6 +_,7 @@
3836
}
3937
}
4038
// CraftBukkit end

purpur-server/minecraft-patches/rejected/net/minecraft/core/BlockPos.java.patch renamed to purpur-server/minecraft-patches/sources/net/minecraft/core/BlockPos.java.patch

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
--- a/net/minecraft/core/BlockPos.java
22
+++ b/net/minecraft/core/BlockPos.java
3-
@@ -63,6 +_,12 @@
4-
public static final int MAX_HORIZONTAL_COORDINATE = 33554431;
5-
// Paper end - Optimize Bit Operations by inlining
3+
@@ -61,6 +_,12 @@
4+
private static final int X_OFFSET = PACKED_Y_LENGTH + PACKED_HORIZONTAL_LENGTH;
5+
public static final int MAX_HORIZONTAL_COORDINATE = (1 << PACKED_HORIZONTAL_LENGTH) / 2 - 1;
66

77
+ // Purpur start - Ridables
88
+ public BlockPos(net.minecraft.world.entity.Entity entity) {
+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
--- a/net/minecraft/core/dispenser/DispenseItemBehavior.java
22
+++ b/net/minecraft/core/dispenser/DispenseItemBehavior.java
3-
@@ -892,5 +_,22 @@
3+
@@ -735,5 +_,22 @@
44
DispenserBlock.registerBehavior(Items.TNT_MINECART, new MinecartDispenseItemBehavior(EntityType.TNT_MINECART));
55
DispenserBlock.registerBehavior(Items.HOPPER_MINECART, new MinecartDispenseItemBehavior(EntityType.HOPPER_MINECART));
66
DispenserBlock.registerBehavior(Items.COMMAND_BLOCK_MINECART, new MinecartDispenseItemBehavior(EntityType.COMMAND_BLOCK_MINECART));
+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
--- a/net/minecraft/core/dispenser/EquipmentDispenseItemBehavior.java
22
+++ b/net/minecraft/core/dispenser/EquipmentDispenseItemBehavior.java
3-
@@ -31,7 +_,7 @@
3+
@@ -32,7 +_,7 @@
44
return false;
55
} else {
66
LivingEntity livingEntity = entitiesOfClass.getFirst();
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
--- a/net/minecraft/gametest/framework/GameTestHelper.java
22
+++ b/net/minecraft/gametest/framework/GameTestHelper.java
3-
@@ -279,6 +_,8 @@
4-
return gameType.isCreative();
3+
@@ -292,6 +_,8 @@
4+
return gameType;
55
}
66

77
+ public void setAfk(final boolean afk) {} // Purpur - AFK API
88
+
99
@Override
10-
public boolean isLocalPlayer() {
11-
return true;
10+
public boolean isClientAuthoritative() {
11+
return false;

0 commit comments

Comments
 (0)