Skip to content

Commit 54283ad

Browse files
grannygranny
committed
Updated Upstream (Paper)
Upstream has released updates that appear to apply and compile correctly Paper Changes: PaperMC/Paper@cc0f25cb Apply more feature patches PaperMC/Paper@e7b684ed fix PaperMC/Paper@71ccae07 Revert "move block data/state impl" PaperMC/Paper@7612b5d0 Add identifier comparator for Plugin tickets PaperMC/Paper@35b466e3 Add support for getting data components from entities PaperMC/Paper@9f50f858 patch PaperMC/Paper@42623c4b no patch
1 parent b81ab42 commit 54283ad

28 files changed

+117
-118
lines changed

‎gradle.properties

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ group = org.purpurmc.purpur
22
version = 1.21.5-R0.1-SNAPSHOT
33

44
mcVersion = 1.21.5
5-
paperCommit = ef0f0d101f97523b7b2df22fa90c04951bb48bca
5+
paperCommit = 42623c4b27f579d874cab29bed7477608135c018
66

77
org.gradle.configuration-cache = true
88
org.gradle.caching = true

‎purpur-api/paper-patches/files/src/main/java/org/bukkit/entity/Entity.java.patch

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
--- a/src/main/java/org/bukkit/entity/Entity.java
22
+++ b/src/main/java/org/bukkit/entity/Entity.java
3-
@@ -1214,4 +_,59 @@
3+
@@ -1215,4 +_,59 @@
44
*/
55
void broadcastHurtAnimation(@NotNull java.util.Collection<Player> players);
66
// Paper end - broadcast hurt animation

‎purpur-api/paper-patches/files/src/main/java/org/bukkit/inventory/ItemStack.java.patch

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
--- a/src/main/java/org/bukkit/inventory/ItemStack.java
22
+++ b/src/main/java/org/bukkit/inventory/ItemStack.java
3-
@@ -22,6 +_,13 @@
3+
@@ -23,6 +_,13 @@
44
import org.bukkit.persistence.PersistentDataContainer;
55
import org.jetbrains.annotations.NotNull;
66
import org.jetbrains.annotations.Nullable;
@@ -14,7 +14,7 @@
1414

1515
/**
1616
* Represents a stack of items.
17-
@@ -1371,4 +_,482 @@
17+
@@ -1372,4 +_,482 @@
1818
return this.craftDelegate.matchesWithoutData(item, excludeTypes, ignoreCount);
1919
}
2020
// Paper end - data component API

‎purpur-server/minecraft-patches/features/0001-Ridables.patch

+11-11
Original file line numberDiff line numberDiff line change
@@ -18,34 +18,34 @@ index fa7a2a85adf7758a753c54a7cf75cc667922d3d7..b0a86aac9603e72062f59dbe67c88ed8
1818
public boolean isClientAuthoritative() {
1919
return false;
2020
diff --git a/net/minecraft/server/MinecraftServer.java b/net/minecraft/server/MinecraftServer.java
21-
index f9aa990f0efa7abb681dd82fd5c8be9f8fcf917a..be8be8e3da80823917633de22985f7f4ef26dfe6 100644
21+
index 924dc9a32cd78f37078ff47cde54e61844572f47..d1e33c3ed23f4c68694ec3628c64e87dcbc916d9 100644
2222
--- a/net/minecraft/server/MinecraftServer.java
2323
+++ b/net/minecraft/server/MinecraftServer.java
24-
@@ -1722,6 +1722,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
25-
serverLevel.hasPhysicsEvent = org.bukkit.event.block.BlockPhysicsEvent.getHandlerList().getRegisteredListeners().length > 0; // Paper - BlockPhysicsEvent
24+
@@ -1743,6 +1743,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
2625
serverLevel.hasEntityMoveEvent = io.papermc.paper.event.entity.EntityMoveEvent.getHandlerList().getRegisteredListeners().length > 0; // Paper - Add EntityMoveEvent
2726
serverLevel.updateLagCompensationTick(); // Paper - lag compensation
27+
net.minecraft.world.level.block.entity.HopperBlockEntity.skipHopperEvents = serverLevel.paperConfig().hopper.disableMoveEvent || org.bukkit.event.inventory.InventoryMoveItemEvent.getHandlerList().getRegisteredListeners().length == 0; // Paper - Perf: Optimize Hoppers
2828
+ serverLevel.hasRidableMoveEvent = org.purpurmc.purpur.event.entity.RidableMoveEvent.getHandlerList().getRegisteredListeners().length > 0; // Purpur - Ridables
2929
profilerFiller.push(() -> serverLevel + " " + serverLevel.dimension().location());
3030
/* Drop global time updates
3131
if (this.tickCount % 20 == 0) {
3232
diff --git a/net/minecraft/server/level/ServerLevel.java b/net/minecraft/server/level/ServerLevel.java
33-
index 6e314abd57045693fd6016bce2b791eb68e40bb5..9b35652ed35c0b7ddb200239d932c83945ea4575 100644
33+
index 17d021c341fb382768a0e8971bd559a11804151f..9de064829001199d6cd1bbeac05b6ee7c3000e4b 100644
3434
--- a/net/minecraft/server/level/ServerLevel.java
3535
+++ b/net/minecraft/server/level/ServerLevel.java
36-
@@ -212,6 +212,7 @@ public class ServerLevel extends Level implements ServerEntityGetter, WorldGenLe
37-
public final java.util.UUID uuid;
36+
@@ -213,6 +213,7 @@ public class ServerLevel extends Level implements ServerEntityGetter, WorldGenLe
3837
public boolean hasPhysicsEvent = true; // Paper - BlockPhysicsEvent
3938
public boolean hasEntityMoveEvent; // Paper - Add EntityMoveEvent
39+
private final alternate.current.wire.WireHandler wireHandler = new alternate.current.wire.WireHandler(this); // Paper - optimize redstone (Alternate Current)
4040
+ public boolean hasRidableMoveEvent = false; // Purpur - Ridables
4141

4242
@Override
4343
public @Nullable LevelChunk getChunkIfLoaded(int x, int z) {
4444
diff --git a/net/minecraft/server/level/ServerPlayer.java b/net/minecraft/server/level/ServerPlayer.java
45-
index 6f2640c7d7df73fc4ef5ad3f0b232bb3c4c4da47..86964fd2231bca608c2cb3155f70086e893dc1f7 100644
45+
index 77f4d37866b74bb3865afe80b516af724cacd0be..efea20895bc45d63621dd130fc05922ba1e10f87 100644
4646
--- a/net/minecraft/server/level/ServerPlayer.java
4747
+++ b/net/minecraft/server/level/ServerPlayer.java
48-
@@ -794,6 +794,15 @@ public class ServerPlayer extends Player implements ca.spottedleaf.moonrise.patc
48+
@@ -800,6 +800,15 @@ public class ServerPlayer extends Player implements ca.spottedleaf.moonrise.patc
4949
this.trackEnteredOrExitedLavaOnVehicle();
5050
this.updatePlayerAttributes();
5151
this.advancements.flushDirty(this, true);
@@ -62,10 +62,10 @@ index 6f2640c7d7df73fc4ef5ad3f0b232bb3c4c4da47..86964fd2231bca608c2cb3155f70086e
6262

6363
private void updatePlayerAttributes() {
6464
diff --git a/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/net/minecraft/server/network/ServerGamePacketListenerImpl.java
65-
index 63e01ec7e4ab04bb7d389bff485dfedca344bfa2..84b1570d0d88f57f33ff8179f0a78d37b495a217 100644
65+
index db53f813d4b433f9a07a4d3169cd4fba94951c1b..6ba184b5314356214e9ff9508fba57150d92d87a 100644
6666
--- a/net/minecraft/server/network/ServerGamePacketListenerImpl.java
6767
+++ b/net/minecraft/server/network/ServerGamePacketListenerImpl.java
68-
@@ -2766,6 +2766,8 @@ public class ServerGamePacketListenerImpl
68+
@@ -2836,6 +2836,8 @@ public class ServerGamePacketListenerImpl
6969

7070
ServerGamePacketListenerImpl.this.cserver.getPluginManager().callEvent(event);
7171

@@ -75,7 +75,7 @@ index 63e01ec7e4ab04bb7d389bff485dfedca344bfa2..84b1570d0d88f57f33ff8179f0a78d37
7575
if ((target instanceof net.minecraft.world.entity.animal.Bucketable && target instanceof LivingEntity && origItem != null && origItem == Items.WATER_BUCKET) && (event.isCancelled() || ServerGamePacketListenerImpl.this.player.getInventory().getSelectedItem().isEmpty() || !ServerGamePacketListenerImpl.this.player.getInventory().getSelectedItem().is(origItem))) {
7676
target.resendPossiblyDesyncedEntityData(ServerGamePacketListenerImpl.this.player); // Paper - The entire mob gets deleted, so resend it
7777
diff --git a/net/minecraft/world/entity/Entity.java b/net/minecraft/world/entity/Entity.java
78-
index f6edaef36f55ef971386972b8c80d70aa4883ec7..6d18921bf283dac5279c82ae0562927db0f7f14f 100644
78+
index 500e542fa81de7b14cd86c23ce039951d8dc0f95..1edca56b4bf880460148d00b98225fc34bd15f17 100644
7979
--- a/net/minecraft/world/entity/Entity.java
8080
+++ b/net/minecraft/world/entity/Entity.java
8181
@@ -3093,6 +3093,13 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess

‎purpur-server/minecraft-patches/features/0003-Barrels-and-enderchests-6-rows.patch

+2-2
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,10 @@ Subject: [PATCH] Barrels and enderchests 6 rows
55

66

77
diff --git a/net/minecraft/server/players/PlayerList.java b/net/minecraft/server/players/PlayerList.java
8-
index ccea424d813a4c137fa15612b7bcf4fdb5c9a811..a1304bc3b1ebb9fa246004ae418481d48c46975c 100644
8+
index 0fd27e1b01801d418ce9e96ec23dd746484351a4..1ad7747379d60d49f8c27a078b2ae798c8e5d41c 100644
99
--- a/net/minecraft/server/players/PlayerList.java
1010
+++ b/net/minecraft/server/players/PlayerList.java
11-
@@ -1029,6 +1029,27 @@ public abstract class PlayerList {
11+
@@ -1030,6 +1030,27 @@ public abstract class PlayerList {
1212
player.getBukkitEntity().recalculatePermissions(); // CraftBukkit
1313
this.server.getCommands().sendCommands(player);
1414
} // Paper - Add sendOpLevel API

‎purpur-server/minecraft-patches/features/0006-Minecart-settings-and-WASD-controls.patch

+2-2
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,10 @@ Subject: [PATCH] Minecart settings and WASD controls
55

66

77
diff --git a/net/minecraft/server/level/ServerPlayer.java b/net/minecraft/server/level/ServerPlayer.java
8-
index 86964fd2231bca608c2cb3155f70086e893dc1f7..786222aeb501fb31e0d77661b87e8d097c88b8b7 100644
8+
index efea20895bc45d63621dd130fc05922ba1e10f87..5e92affba115662a8b16c7f15971e1770f29cbfd 100644
99
--- a/net/minecraft/server/level/ServerPlayer.java
1010
+++ b/net/minecraft/server/level/ServerPlayer.java
11-
@@ -1183,6 +1183,11 @@ public class ServerPlayer extends Player implements ca.spottedleaf.moonrise.patc
11+
@@ -1189,6 +1189,11 @@ public class ServerPlayer extends Player implements ca.spottedleaf.moonrise.patc
1212
} else {
1313
// Purpur start - Add boat fall damage config
1414
if (damageSource.is(net.minecraft.tags.DamageTypeTags.IS_FALL)) {

‎purpur-server/minecraft-patches/sources/net/minecraft/server/MinecraftServer.java.patch

+2-2
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,7 @@
112112
this.startMeasuringTaskExecutionTime();
113113
this.waitUntilNextTick();
114114
this.finishMeasuringTaskExecutionTime();
115-
@@ -1668,7 +_,7 @@
115+
@@ -1688,7 +_,7 @@
116116
long worldTime = level.getGameTime();
117117
final ClientboundSetTimePacket worldPacket = new ClientboundSetTimePacket(worldTime, dayTime, doDaylight);
118118
for (Player entityhuman : level.players()) {
@@ -121,7 +121,7 @@
121121
continue;
122122
}
123123
ServerPlayer entityplayer = (ServerPlayer) entityhuman;
124-
@@ -1832,7 +_,7 @@
124+
@@ -1853,7 +_,7 @@
125125

126126
@DontObfuscate
127127
public String getServerModName() {

‎purpur-server/minecraft-patches/sources/net/minecraft/server/level/ServerLevel.java.patch

+11-11
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
private final RandomSequences randomSequences;
1010

1111
// CraftBukkit start
12-
@@ -586,7 +_,24 @@
12+
@@ -587,7 +_,24 @@
1313
// CraftBukkit end
1414
this.tickTime = tickTime;
1515
this.server = server;
@@ -35,15 +35,15 @@
3535
this.serverLevelData = serverLevelData;
3636
ChunkGenerator chunkGenerator = levelStem.generator();
3737
// CraftBukkit start
38-
@@ -670,6 +_,7 @@
38+
@@ -671,6 +_,7 @@
3939
this.chunkDataController = new ca.spottedleaf.moonrise.patches.chunk_system.io.datacontroller.ChunkDataController((ServerLevel)(Object)this, this.chunkTaskScheduler);
4040
// Paper end - rewrite chunk system
4141
this.getCraftServer().addWorld(this.getWorld()); // CraftBukkit
4242
+ this.preciseTime = this.serverLevelData.getDayTime(); // Purpur - Configurable daylight cycle
4343
}
4444

4545
// Paper start
46-
@@ -716,7 +_,7 @@
46+
@@ -717,7 +_,7 @@
4747
}
4848

4949
int _int = this.getGameRules().getInt(GameRules.RULE_PLAYERS_SLEEPING_PERCENTAGE);
@@ -52,7 +52,7 @@
5252
// Paper start - create time skip event - move up calculations
5353
final long newDayTime = this.levelData.getDayTime() + 24000L;
5454
org.bukkit.event.world.TimeSkipEvent event = new org.bukkit.event.world.TimeSkipEvent(
55-
@@ -835,6 +_,13 @@
55+
@@ -836,6 +_,13 @@
5656
this.serverLevelData.getScheduledEvents().tick(this.server, l);
5757
Profiler.get().pop();
5858
if (this.serverLevelData.getGameRules().getBoolean(GameRules.RULE_DAYLIGHT)) {
@@ -66,7 +66,7 @@
6666
this.setDayTime(this.levelData.getDayTime() + 1L);
6767
}
6868
}
69-
@@ -842,7 +_,21 @@
69+
@@ -843,7 +_,21 @@
7070

7171
public void setDayTime(long time) {
7272
this.serverLevelData.setDayTime(time);
@@ -89,7 +89,7 @@
8989

9090
public void tickCustomSpawners(boolean spawnEnemies, boolean spawnFriendlies) {
9191
for (CustomSpawner customSpawner : this.customSpawners) {
92-
@@ -946,9 +_,17 @@
92+
@@ -947,9 +_,17 @@
9393
&& this.random.nextDouble() < currentDifficultyAt.getEffectiveDifficulty() * this.paperConfig().entities.spawning.skeletonHorseThunderSpawnChance.or(0.01) // Paper - Configurable spawn chances for skeleton horses
9494
&& !this.getBlockState(blockPos.below()).is(Blocks.LIGHTNING_ROD);
9595
if (flag) {
@@ -109,7 +109,7 @@
109109
skeletonHorse.setAge(0);
110110
skeletonHorse.setPos(blockPos.getX(), blockPos.getY(), blockPos.getZ());
111111
this.addFreshEntity(skeletonHorse, org.bukkit.event.entity.CreatureSpawnEvent.SpawnReason.LIGHTNING); // CraftBukkit
112-
@@ -1006,7 +_,7 @@
112+
@@ -1007,7 +_,7 @@
113113
pointOfInterestType -> pointOfInterestType.is(PoiTypes.LIGHTNING_ROD),
114114
blockPos -> blockPos.getY() == this.getHeight(Heightmap.Types.WORLD_SURFACE, blockPos.getX(), blockPos.getZ()) - 1,
115115
pos,
@@ -118,7 +118,7 @@
118118
PoiManager.Occupancy.ANY
119119
);
120120
return optional.map(blockPos -> blockPos.above(1));
121-
@@ -1055,8 +_,26 @@
121+
@@ -1056,8 +_,26 @@
122122
int _int = this.getGameRules().getInt(GameRules.RULE_PLAYERS_SLEEPING_PERCENTAGE);
123123
Component component;
124124
if (this.sleepStatus.areEnoughSleeping(_int)) {
@@ -145,23 +145,23 @@
145145
component = Component.translatable("sleep.players_sleeping", this.sleepStatus.amountSleeping(), this.sleepStatus.sleepersNeeded(_int));
146146
}
147147

148-
@@ -1189,6 +_,7 @@
148+
@@ -1190,6 +_,7 @@
149149
@VisibleForTesting
150150
public void resetWeatherCycle() {
151151
// CraftBukkit start
152152
+ if (this.purpurConfig.rainStopsAfterSleep) // Purpur - Option for if rain and thunder should stop on sleep
153153
this.serverLevelData.setRaining(false, org.bukkit.event.weather.WeatherChangeEvent.Cause.SLEEP); // Paper - Add cause to Weather/ThunderChangeEvents
154154
// If we stop due to everyone sleeping we should reset the weather duration to some other random value.
155155
// Not that everyone ever manages to get the whole server to sleep at the same time....
156-
@@ -1196,6 +_,7 @@
156+
@@ -1197,6 +_,7 @@
157157
this.serverLevelData.setRainTime(0);
158158
}
159159
// CraftBukkit end
160160
+ if (this.purpurConfig.thunderStopsAfterSleep) // Purpur - Option for if rain and thunder should stop on sleep
161161
this.serverLevelData.setThundering(false, org.bukkit.event.weather.ThunderChangeEvent.Cause.SLEEP); // Paper - Add cause to Weather/ThunderChangeEvents
162162
// CraftBukkit start
163163
// If we stop due to everyone sleeping we should reset the weather duration to some other random value.
164-
@@ -2644,7 +_,7 @@
164+
@@ -2674,7 +_,7 @@
165165
// Spigot start
166166
if (entity.getBukkitEntity() instanceof org.bukkit.inventory.InventoryHolder && (!(entity instanceof ServerPlayer) || entity.getRemovalReason() != Entity.RemovalReason.KILLED)) { // SPIGOT-6876: closeInventory clears death message
167167
// Paper start - Fix merchant inventory not closing on entity removal

‎purpur-server/minecraft-patches/sources/net/minecraft/server/level/ServerPlayer.java.patch

+13-13
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
--- a/net/minecraft/server/level/ServerPlayer.java
22
+++ b/net/minecraft/server/level/ServerPlayer.java
3-
@@ -422,6 +_,10 @@
3+
@@ -428,6 +_,10 @@
44
public @Nullable com.destroystokyo.paper.event.entity.PlayerNaturallySpawnCreaturesEvent playerNaturallySpawnedEvent; // Paper - PlayerNaturallySpawnCreaturesEvent
55
public @Nullable String clientBrandName = null; // Paper - Brand support
66
public @Nullable org.bukkit.event.player.PlayerQuitEvent.QuitReason quitReason = null; // Paper - Add API for quit reason; there are a lot of changes to do if we change all methods leading to the event
@@ -11,7 +11,7 @@
1111

1212
// Paper start - rewrite chunk system
1313
private ca.spottedleaf.moonrise.patches.chunk_system.player.RegionizedPlayerChunkLoader.PlayerChunkLoaderData chunkLoader;
14-
@@ -555,6 +_,10 @@
14+
@@ -561,6 +_,10 @@
1515
this.respawnConfig = compound.read("respawn", ServerPlayer.RespawnConfig.CODEC).orElse(null);
1616
this.spawnExtraParticlesOnFall = compound.getBooleanOr("spawn_extra_particles_on_fall", false);
1717
this.raidOmenPosition = compound.read("raid_omen_position", BlockPos.CODEC).orElse(null);
@@ -22,7 +22,7 @@
2222
}
2323

2424
@Override
25-
@@ -572,6 +_,9 @@
25+
@@ -578,6 +_,9 @@
2626
compound.storeNullable("raid_omen_position", BlockPos.CODEC, this.raidOmenPosition);
2727
this.saveEnderPearls(compound);
2828
this.getBukkitEntity().setExtraData(compound); // CraftBukkit
@@ -32,15 +32,15 @@
3232
}
3333

3434
private void saveParentVehicle(CompoundTag tag) {
35-
@@ -1054,6 +_,7 @@
35+
@@ -1060,6 +_,7 @@
3636
)
3737
);
3838
Team team = this.getTeam();
3939
+ if (org.purpurmc.purpur.PurpurConfig.deathMessageOnlyBroadcastToAffectedPlayer) this.sendSystemMessage(deathMessage); else // Purpur - Configurable broadcast settings
4040
if (team == null || team.getDeathMessageVisibility() == Team.Visibility.ALWAYS) {
4141
this.server.getPlayerList().broadcastSystemMessage(deathMessage, false);
4242
} else if (team.getDeathMessageVisibility() == Team.Visibility.HIDE_FOR_OTHER_TEAMS) {
43-
@@ -1160,6 +_,13 @@
43+
@@ -1166,6 +_,13 @@
4444
if (this.isInvulnerableTo(level, damageSource)) {
4545
return false;
4646
} else {
@@ -54,15 +54,15 @@
5454
Entity entity = damageSource.getEntity();
5555
if (!( // Paper - split the if statement. If below statement is false, hurtServer would not have been evaluated. Return false.
5656
!(entity instanceof Player player && !this.canHarmPlayer(player))
57-
@@ -1390,6 +_,7 @@
57+
@@ -1396,6 +_,7 @@
5858
serverLevel.removePlayerImmediately(this, Entity.RemovalReason.CHANGED_DIMENSION);
5959
this.unsetRemoved();
6060
// CraftBukkit end
6161
+ this.portalPos = org.bukkit.craftbukkit.util.CraftLocation.toBlockPosition(exit); // Purpur - Fix stuck in portals
6262
this.setServerLevel(level);
6363
this.connection.internalTeleport(PositionMoveRotation.of(teleportTransition), teleportTransition.relatives()); // CraftBukkit - use internal teleport without event
6464
this.connection.resetPosition();
65-
@@ -1507,7 +_,7 @@
65+
@@ -1513,7 +_,7 @@
6666
new AABB(vec3.x() - 8.0, vec3.y() - 5.0, vec3.z() - 8.0, vec3.x() + 8.0, vec3.y() + 5.0, vec3.z() + 8.0),
6767
monster -> monster.isPreventingPlayerRest(this.serverLevel(), this)
6868
);
@@ -71,7 +71,7 @@
7171
return Either.left(Player.BedSleepingProblem.NOT_SAFE);
7272
}
7373
}
74-
@@ -1544,7 +_,19 @@
74+
@@ -1550,7 +_,19 @@
7575
CriteriaTriggers.SLEPT_IN_BED.trigger(this);
7676
});
7777
if (!this.serverLevel().canSleepThroughNights()) {
@@ -92,15 +92,15 @@
9292
}
9393

9494
((ServerLevel)this.level()).updateSleepingPlayerList();
95-
@@ -1636,6 +_,7 @@
95+
@@ -1642,6 +_,7 @@
9696

9797
@Override
9898
public void openTextEdit(SignBlockEntity signEntity, boolean isFrontText) {
9999
+ if (level().purpurConfig.signAllowColors) this.connection.send(signEntity.getTranslatedUpdatePacket(textFilteringEnabled, isFrontText)); // Purpur - Signs allow color codes
100100
this.connection.send(new ClientboundBlockUpdatePacket(this.level(), signEntity.getBlockPos()));
101101
this.connection.send(new ClientboundOpenSignEditorPacket(signEntity.getBlockPos(), isFrontText));
102102
}
103-
@@ -1938,6 +_,26 @@
103+
@@ -1944,6 +_,26 @@
104104
this.lastSentExp = -1; // CraftBukkit - Added to reset
105105
}
106106

@@ -127,7 +127,7 @@
127127
@Override
128128
public void displayClientMessage(Component chatComponent, boolean actionBar) {
129129
this.sendSystemMessage(chatComponent, actionBar);
130-
@@ -2155,6 +_,20 @@
130+
@@ -2161,6 +_,20 @@
131131
);
132132
}
133133

@@ -148,7 +148,7 @@
148148
public void sendSystemMessage(Component mesage) {
149149
this.sendSystemMessage(mesage, false);
150150
}
151-
@@ -2293,7 +_,67 @@
151+
@@ -2299,7 +_,67 @@
152152

153153
public void resetLastActionTime() {
154154
this.lastActionTime = Util.getMillis();
@@ -217,7 +217,7 @@
217217

218218
public ServerStatsCounter getStats() {
219219
return this.stats;
220-
@@ -2921,4 +_,56 @@
220+
@@ -2927,4 +_,56 @@
221221
return (org.bukkit.craftbukkit.entity.CraftPlayer) super.getBukkitEntity();
222222
}
223223
// CraftBukkit end

0 commit comments

Comments
 (0)