Mirrors/Purpur
1
0
Fork 1
mirror of https://github.com/PurpurMC/Purpur.git synced 2026-02-17 16:37:43 +01:00
Code Issues Packages Projects Releases Wiki Activity

we compile

Browse Source
This commit is contained in:
Ben Kerllenevich
2022-06-08 13:45:48 -04:00
parent 856416cca4
commit 6268dc4452
10 changed files with 39 additions and 97 deletions
Download Patch File Download Diff File Expand all files Collapse all files

82
patches/server/0004-Component-related-conveniences.patch
View File

@@ -36,65 +36,23 @@ index 062a06dbff672235acc87624f1b7c28f04ffce32..54999c41a39e8c5baed67e01be3d2838
public void displayClientMessage(Component message, boolean actionBar) {
this.sendSystemMessage(message, actionBar ? ChatType.GAME_INFO : ChatType.SYSTEM);
diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
index 5134af3c96b8df8534db543971c1d574eec31f55..65a7113aec71db08d642946278472f58b6da7bd9 100644
index 5134af3c96b8df8534db543971c1d574eec31f55..46a8b5c7a1ac2031110f7386a900ade43925e4a5 100644
--- a/src/main/java/net/minecraft/server/players/PlayerList.java
+++ b/src/main/java/net/minecraft/server/players/PlayerList.java
@@ -1064,6 +1064,62 @@ public abstract class PlayerList {
@@ -1064,6 +1064,20 @@ public abstract class PlayerList {
}
// CraftBukkit end
+ // Purpur start
+ public void broadcast(@Nullable String message) {
+ broadcast(message, Util.NIL_UUID);
+ }
+
+ public void broadcast(@Nullable String message, ChatType type) {
+ broadcast(message, type, Util.NIL_UUID);
+ }
+
+ public void broadcast(@Nullable String message, UUID sender) {
+ broadcast(message, ChatType.SYSTEM, sender);
+ }
+
+ public void broadcast(@Nullable String message, ChatType type, UUID sender) {
+ // Purpur Start
+ public void broadcastMiniMessage(@Nullable String message, ResourceKey<ChatType> type) {
+ if (message != null) {
+ broadcast(net.kyori.adventure.text.minimessage.MiniMessage.miniMessage().deserialize(message), type, sender);
+ this.broadcastMessage(net.kyori.adventure.text.minimessage.MiniMessage.miniMessage().deserialize(message), type);
+ }
+ }
+
+ public void broadcast(@Nullable net.kyori.adventure.text.Component message) {
+ broadcast(message, Util.NIL_UUID);
+ }
+
+ public void broadcast(@Nullable net.kyori.adventure.text.Component message, ChatType type) {
+ broadcast(message, type, Util.NIL_UUID);
+ }
+
+ public void broadcast(@Nullable net.kyori.adventure.text.Component message, UUID sender) {
+ broadcast(message, ChatType.SYSTEM, sender);
+ }
+
+ public void broadcast(@Nullable net.kyori.adventure.text.Component message, ChatType type, UUID sender) {
+ public void broadcastMessage(@Nullable net.kyori.adventure.text.Component message, ResourceKey<ChatType> type) {
+ if (message != null) {
+ broadcast(io.papermc.paper.adventure.PaperAdventure.asVanilla(message), type, sender);
+ }
+ }
+
+ public void broadcast(@Nullable Component message) {
+ broadcast(message, Util.NIL_UUID);
+ }
+
+ public void broadcast(@Nullable Component message, ChatType type) {
+ broadcast(message, type, Util.NIL_UUID);
+ }
+
+ public void broadcast(@Nullable Component message, UUID sender) {
+ broadcast(message, ChatType.SYSTEM, sender);
+ }
+
+ public void broadcast(@Nullable Component message, ChatType type, UUID sender) {
+ if (message != null) {
+ broadcastMessage(message, type, sender);
+ this.broadcastSystemMessage(io.papermc.paper.adventure.PaperAdventure.asVanilla(message), type);
+ }
+ }
+ // Purpur end
@@ -123,37 +81,23 @@ index 67bce77093dcc126098731047447da2031e3388d..c4088446d30c3b25cf196f51fd394cd0
return this.isFireSource;
}
diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
index 0473a4d80f58538ea3cabcd38684339b27c1d29c..4ac33be263c3380a1ccc01affe3e20d46badd46e 100644
index 0473a4d80f58538ea3cabcd38684339b27c1d29c..2c42e2c39a13372833a4ba9a027e0315b150ab6c 100644
--- a/src/main/java/net/minecraft/world/entity/Entity.java
+++ b/src/main/java/net/minecraft/world/entity/Entity.java
@@ -3732,6 +3732,34 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
@@ -3732,6 +3732,20 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
return SlotAccess.NULL;
}
+ // Purpur Start
+ public void sendMessage(@Nullable String message) {
+ sendMessage(message, Util.NIL_UUID);
+ }
+
+ public void sendMessage(@Nullable String message, UUID sender) {
+ if (org.apache.commons.lang3.StringUtils.isNotEmpty(message)) {
+ sendMessage(net.kyori.adventure.text.minimessage.MiniMessage.miniMessage().deserialize(message), sender);
+ public void sendMiniMessage(@Nullable String message) {
+ if (message != null) {
+ this.sendMessage(net.kyori.adventure.text.minimessage.MiniMessage.miniMessage().deserialize(message));
+ }
+ }
+
+ public void sendMessage(@Nullable net.kyori.adventure.text.Component message) {
+ sendMessage(message, Util.NIL_UUID);
+ }
+
+ public void sendMessage(@Nullable net.kyori.adventure.text.Component message, UUID sender) {
+ if (message != null) {
+ sendMessage(io.papermc.paper.adventure.PaperAdventure.asVanilla(message), sender);
+ }
+ }
+
+ public void sendMessage(@Nullable Component message) {
+ if (message != null) {
+ sendMessage(message, Util.NIL_UUID);
+ this.sendSystemMessage(io.papermc.paper.adventure.PaperAdventure.asVanilla(message));
+ }
+ }
+ // Purpur end

8
patches/server/0005-Ridables.patch
View File

@@ -79,7 +79,7 @@ index a7bc4eefd73337bfabb84032cd98aba42f5870fd..076c482e6844f6a188267556cd8fbcc5
if ((entity instanceof Bucketable && entity instanceof LivingEntity && origItem != null && origItem.asItem() == Items.WATER_BUCKET) && (event.isCancelled() || ServerGamePacketListenerImpl.this.player.getInventory().getSelected() == null || ServerGamePacketListenerImpl.this.player.getInventory().getSelected().getItem() != origItem)) {
ServerGamePacketListenerImpl.this.send(new ClientboundAddEntityPacket(entity));
diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
index 4ac33be263c3380a1ccc01affe3e20d46badd46e..4b01ef01efe128cdeac548c592f62d72c9e0169e 100644
index 2c42e2c39a13372833a4ba9a027e0315b150ab6c..f3c2cec6cef8f372cb56c28f985bce090bca2be0 100644
--- a/src/main/java/net/minecraft/world/entity/Entity.java
+++ b/src/main/java/net/minecraft/world/entity/Entity.java
@@ -356,7 +356,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
@@ -119,7 +119,7 @@ index 4ac33be263c3380a1ccc01affe3e20d46badd46e..4b01ef01efe128cdeac548c592f62d72
if (this.passengers.size() == 1 && this.passengers.get(0) == entity) {
this.passengers = ImmutableList.of();
} else {
@@ -4431,4 +4445,45 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
@@ -4417,4 +4431,45 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
return ((ServerChunkCache) level.getChunkSource()).isPositionTicking(this);
}
// Paper end
@@ -272,7 +272,7 @@ index 32b0603063032677d734a1c173677f544ce7cc5c..52086efc539b854c159d5166e33b49d9
// Paper end
if (!this.level.isClientSide && this.isSensitiveToWater() && this.isInWaterRainOrBubble()) {
diff --git a/src/main/java/net/minecraft/world/entity/Mob.java b/src/main/java/net/minecraft/world/entity/Mob.java
index a55c30d86793bf224b536a7ceefce75c70b618c7..fdb8f0bb0996dec6724066ae6de103131fdde6a1 100644
index a55c30d86793bf224b536a7ceefce75c70b618c7..a6217bc88e3a9d302e2ce8d453170017c8cfaf54 100644
--- a/src/main/java/net/minecraft/world/entity/Mob.java
+++ b/src/main/java/net/minecraft/world/entity/Mob.java
@@ -146,8 +146,8 @@ public abstract class Mob extends LivingEntity {
@@ -335,7 +335,7 @@ index a55c30d86793bf224b536a7ceefce75c70b618c7..fdb8f0bb0996dec6724066ae6de10313
+ }
+ }
+ if (!player.getBukkitEntity().hasPermission("allow.ride." + getType().id)) {
+ player.sendMessage(org.purpurmc.purpur.PurpurConfig.cannotRideMob);
+ player.sendMiniMessage(org.purpurmc.purpur.PurpurConfig.cannotRideMob);
+ return InteractionResult.PASS;
+ }
+ player.setYRot(this.getYRot());

4
patches/server/0008-Barrels-and-enderchests-6-rows.patch
View File

@@ -5,10 +5,10 @@ Subject: [PATCH] Barrels and enderchests 6 rows
diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
index 65a7113aec71db08d642946278472f58b6da7bd9..0fabd5998c20f6b6a682bed2086db047c19dd9c3 100644
index 46a8b5c7a1ac2031110f7386a900ade43925e4a5..a4bb44eaa8cbf30b8a2945473ed0c1063c7784d3 100644
--- a/src/main/java/net/minecraft/server/players/PlayerList.java
+++ b/src/main/java/net/minecraft/server/players/PlayerList.java
@@ -1231,6 +1231,27 @@ public abstract class PlayerList {
@@ -1189,6 +1189,27 @@ public abstract class PlayerList {
player.getBukkitEntity().recalculatePermissions(); // CraftBukkit
this.server.getCommands().sendCommands(player);
} // Paper

6
patches/server/0010-AFK-API.patch
View File

@@ -5,7 +5,7 @@ Subject: [PATCH] AFK API
diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
index 347c01f091144f82f6eed996d424400d82634cff..b75986ae56d0a0ad6a8d347852eb94b1e4b16a79 100644
index 347c01f091144f82f6eed996d424400d82634cff..e657ba0638bf17353289586ca7303b59c1bc62b1 100644
--- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
+++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
@@ -2000,8 +2000,58 @@ public class ServerPlayer extends Player {
@@ -39,7 +39,7 @@ index 347c01f091144f82f6eed996d424400d82634cff..b75986ae56d0a0ad6a8d347852eb94b1
+
+ msg = event.getBroadcastMsg();
+ if (msg != null && !msg.isEmpty()) {
+ server.getPlayerList().broadcast(String.format(msg, this.getGameProfile().getName()));
+ server.getPlayerList().broadcastMiniMessage(String.format(msg, this.getGameProfile().getName()), ChatType.SYSTEM);
+ }
+
+ if (level.purpurConfig.idleTimeoutUpdateTabList) {
@@ -213,7 +213,7 @@ index 3f458ddd4dc04ed28510a212be76bb19e7f6a61e..a36469186f72eccf8c4428d920d0583b
if (range < 0.0D || d < range * range) {
return true;
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
index 331d9b64fd3e005c8b95fe3c926f3691392a05dc..c8becc0ece63387df0a17d192f92f35609acc181 100644
index d87d521adbbc1c211f04bee0be15715948bde652..f35f60b6fe470d9bc239ce9017f3a82ed984d342 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -442,10 +442,15 @@ public class CraftPlayer extends CraftHumanEntity implements Player {

4
patches/server/0050-Add-permission-for-F3-N-debug.patch
View File

@@ -5,10 +5,10 @@ Subject: [PATCH] Add permission for F3+N debug
diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
index 68478f19e029d3544505188fd42950d63d91c86f..72a4ceb96169552325c3c96a5bc880e7e825f37d 100644
index e3d4d6c6205208fa007ec320a06a16d56319a7ac..5cd91d4de2521dec6cd9822b3eac82590aa9674b 100644
--- a/src/main/java/net/minecraft/server/players/PlayerList.java
+++ b/src/main/java/net/minecraft/server/players/PlayerList.java
@@ -1225,6 +1225,7 @@ public abstract class PlayerList {
@@ -1183,6 +1183,7 @@ public abstract class PlayerList {
} else {
b0 = (byte) (24 + permissionLevel);
}

4
patches/server/0060-Add-canSaveToDisk-to-Entity.patch
View File

@@ -5,10 +5,10 @@ Subject: [PATCH] Add canSaveToDisk to Entity
diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
index 7735941f4a23e1baffc97055853bb88ef99954f3..6845db2405f1bc324aad9d1945dbd0c0ce6a69f8 100644
index 2f06de6afed296677b451e26a0079dc437a7c549..1c9e36b6b474e305695fa79af5544c45717bdb47 100644
--- a/src/main/java/net/minecraft/world/entity/Entity.java
+++ b/src/main/java/net/minecraft/world/entity/Entity.java
@@ -4486,5 +4486,9 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
@@ -4472,5 +4472,9 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
public boolean processClick(InteractionHand hand) {
return false;
}

4
patches/server/0090-Stop-squids-floating-on-top-of-water.patch
View File

@@ -5,10 +5,10 @@ Subject: [PATCH] Stop squids floating on top of water
diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
index 6845db2405f1bc324aad9d1945dbd0c0ce6a69f8..f5377087edd30e5ce8f68bebbba76c36f7cc0f6a 100644
index 1c9e36b6b474e305695fa79af5544c45717bdb47..a7b987fcc1af08253ba8843812394572773b771a 100644
--- a/src/main/java/net/minecraft/world/entity/Entity.java
+++ b/src/main/java/net/minecraft/world/entity/Entity.java
@@ -4015,6 +4015,12 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
@@ -4001,6 +4001,12 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
this.yRotO = this.getYRot();
}

14
patches/server/0117-Option-for-Villager-Clerics-to-farm-Nether-Wart.patch
View File

@@ -8,7 +8,7 @@ farm Nether Wart. Reimplemented based on a feature of the carpet-extra
mod.
diff --git a/src/main/java/net/minecraft/world/entity/ai/behavior/HarvestFarmland.java b/src/main/java/net/minecraft/world/entity/ai/behavior/HarvestFarmland.java
index 17c76c310435f501d350bd99debacd242739196e..1793852b6587960e260727910ffc30d2d497520f 100644
index 17c76c310435f501d350bd99debacd242739196e..2ad6f887db730466da39ad8fdd7c97c098e9966a 100644
--- a/src/main/java/net/minecraft/world/entity/ai/behavior/HarvestFarmland.java
+++ b/src/main/java/net/minecraft/world/entity/ai/behavior/HarvestFarmland.java
@@ -34,6 +34,7 @@ public class HarvestFarmland extends Behavior<Villager> {
@@ -57,22 +57,20 @@ index 17c76c310435f501d350bd99debacd242739196e..1793852b6587960e260727910ffc30d2
SimpleContainer inventorysubcontainer = entityvillager.getInventory();
for (int j = 0; j < inventorysubcontainer.getContainerSize(); ++j) {
@@ -119,6 +122,14 @@ public class HarvestFarmland extends Behavior<Villager> {
@@ -119,6 +122,12 @@ public class HarvestFarmland extends Behavior<Villager> {
BlockState iblockdata1;
// CraftBukkit start
+ // Purpur start
+ if (this.clericWartFarmer) {
+ if (itemstack.getItem() == Items.NETHER_WART) {
+ iblockdata1 = Blocks.NETHER_WART.defaultBlockState();
+ flag = true;
+ }
+ if (this.clericWartFarmer && itemstack.getItem() == Items.NETHER_WART) {
+ iblockdata1 = Blocks.NETHER_WART.defaultBlockState();
+ flag = true;
+ } else
+ // Purpur end
if (itemstack.is(Items.WHEAT_SEEDS)) {
iblockdata1 = Blocks.WHEAT.defaultBlockState();
flag = true;
@@ -145,7 +156,7 @@ public class HarvestFarmland extends Behavior<Villager> {
@@ -145,7 +154,7 @@ public class HarvestFarmland extends Behavior<Villager> {
}
if (flag) {

4
patches/server/0169-Configurable-broadcast-settings.patch
View File

@@ -17,14 +17,14 @@ index 161a2b122843318a1bc411ea09ef83bc56bff0d1..fb1f9574235aec9e6b2e0fa289ce0853
// Paper end
}
diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
index 1b6a8932972862a5f2c4f0614362b5c3cf37b096..ee95f92443a313852ebb880af302899c18394a15 100644
index 7be90aca3c5b9a1a7aad22890c4bfd1a6544aa4c..2642fb12c68cf60f2e57c0717a20f5ef8564da59 100644
--- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
+++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
@@ -923,6 +923,7 @@ public class ServerPlayer extends Player {
});
Team scoreboardteambase = this.getTeam();
+ if (org.purpurmc.purpur.PurpurConfig.deathMessageOnlyBroadcastToAffectedPlayer) this.sendMessage(ichatbasecomponent); else // Purpur
+ if (org.purpurmc.purpur.PurpurConfig.deathMessageOnlyBroadcastToAffectedPlayer) this.sendSystemMessage(ichatbasecomponent); else // Purpur
if (scoreboardteambase != null && scoreboardteambase.getDeathMessageVisibility() != Team.Visibility.ALWAYS) {
if (scoreboardteambase.getDeathMessageVisibility() == Team.Visibility.HIDE_FOR_OTHER_TEAMS) {
this.server.getPlayerList().broadcastSystemToTeam(this, ichatbasecomponent);

6
patches/server/0182-API-for-any-mob-to-burn-daylight.patch
View File

@@ -6,10 +6,10 @@ Subject: [PATCH] API for any mob to burn daylight
Co-authored by: Encode42 <me@encode42.dev>
diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
index 07d5609825a8b3c635043d95a3c6fc3b0e0bafec..49f6bf5ab0baf318d75a85b92db4ecc61b7028fd 100644
index 79db12259f154fd7dedf1311051c698492e3817b..8ba651d40ed75e30961e63a32b815dd35f7746b6 100644
--- a/src/main/java/net/minecraft/world/entity/Entity.java
+++ b/src/main/java/net/minecraft/world/entity/Entity.java
@@ -4499,5 +4499,20 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
@@ -4485,5 +4485,20 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
public boolean canSaveToDisk() {
return true;
}
@@ -91,7 +91,7 @@ index 5a742e95da47208366e791a10ce1e82d0c3524b4..b2036c0bd97126290c581b0c48e25d8f
public boolean isSensitiveToWater() {
diff --git a/src/main/java/net/minecraft/world/entity/Mob.java b/src/main/java/net/minecraft/world/entity/Mob.java
index ce72ba463449958ddc798feea3824a97fbba0bed..f689085fae18cd7d8c9187fdeb1b684b17b98afc 100644
index 473e2a1a8104669eed3db862560e67b426297aba..210a7c737261a42101f3d22b8a2464639c75b17a 100644
--- a/src/main/java/net/minecraft/world/entity/Mob.java
+++ b/src/main/java/net/minecraft/world/entity/Mob.java
@@ -1673,17 +1673,7 @@ public abstract class Mob extends LivingEntity {