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

merge upstream

Browse Source
This commit is contained in:
Ben Kerllenevich
2022-06-08 14:35:27 -04:00
parent 109b1d882b
commit 9dff3ce224
9 changed files with 22 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
gradle.properties
View File

@@ -1,7 +1,7 @@
group = org.purpurmc.purpur
version = 1.19-R0.1-SNAPSHOT
paperCommit = 44ccc15a30eca5e1940911ec68c886b120ac2671
paperCommit = a93aa05bf8ed7d293f4ecba432491ab481eec05d
org.gradle.caching = true
org.gradle.parallel = true

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

@@ -36,10 +36,10 @@ 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..46a8b5c7a1ac2031110f7386a900ade43925e4a5 100644
index f79c4212a5a3f564d00749f21e32639096c3257a..f5031d16853a3462f6049963180f50536889a301 100644
--- a/src/main/java/net/minecraft/server/players/PlayerList.java
+++ b/src/main/java/net/minecraft/server/players/PlayerList.java
@@ -1064,6 +1064,20 @@ public abstract class PlayerList {
@@ -1067,6 +1067,20 @@ public abstract class PlayerList {
}
// CraftBukkit end

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 46a8b5c7a1ac2031110f7386a900ade43925e4a5..a4bb44eaa8cbf30b8a2945473ed0c1063c7784d3 100644
index f5031d16853a3462f6049963180f50536889a301..ae3a7cc79897b2a247d63d1428d1a97e586d64ca 100644
--- a/src/main/java/net/minecraft/server/players/PlayerList.java
+++ b/src/main/java/net/minecraft/server/players/PlayerList.java
@@ -1189,6 +1189,27 @@ public abstract class PlayerList {
@@ -1192,6 +1192,27 @@ public abstract class PlayerList {
player.getBukkitEntity().recalculatePermissions(); // CraftBukkit
this.server.getCommands().sendCommands(player);
} // Paper

6
patches/server/0017-Player-invulnerabilities.patch
View File

@@ -5,7 +5,7 @@ Subject: [PATCH] Player invulnerabilities
diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
index b75986ae56d0a0ad6a8d347852eb94b1e4b16a79..39d86b7b3a01f2eefb7c0725e930a5371e7baf46 100644
index e657ba0638bf17353289586ca7303b59c1bc62b1..fc5d69d2dc6470d4d7d0e8af2b96893f21eb3254 100644
--- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
+++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
@@ -261,6 +261,7 @@ public class ServerPlayer extends Player {
@@ -108,10 +108,10 @@ index 90b6b10ddba0224b8bc7e5f0f70edea809670e3c..efc2204bd712449a93e132a19d31ae99
this.cserver.getPluginManager().callEvent(new PlayerResourcePackStatusEvent(this.getCraftPlayer(), packStatus)); // CraftBukkit
// Paper end
diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
index 0fabd5998c20f6b6a682bed2086db047c19dd9c3..68478f19e029d3544505188fd42950d63d91c86f 100644
index ae3a7cc79897b2a247d63d1428d1a97e586d64ca..d7e65c889167de315206ae2a36f305c6255950a1 100644
--- a/src/main/java/net/minecraft/server/players/PlayerList.java
+++ b/src/main/java/net/minecraft/server/players/PlayerList.java
@@ -1004,6 +1004,8 @@ public abstract class PlayerList {
@@ -1007,6 +1007,8 @@ public abstract class PlayerList {
}
// Paper end

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 e3d4d6c6205208fa007ec320a06a16d56319a7ac..5cd91d4de2521dec6cd9822b3eac82590aa9674b 100644
index d7e65c889167de315206ae2a36f305c6255950a1..a4a895a54ad0266301d50f95eaec3a2bb604f8f1 100644
--- a/src/main/java/net/minecraft/server/players/PlayerList.java
+++ b/src/main/java/net/minecraft/server/players/PlayerList.java
@@ -1183,6 +1183,7 @@ public abstract class PlayerList {
@@ -1186,6 +1186,7 @@ public abstract class PlayerList {
} else {
b0 = (byte) (24 + permissionLevel);
}

4
patches/server/0119-Spread-out-and-optimise-player-list-ticksSpread-out-.patch
View File

@@ -6,10 +6,10 @@ Subject: [PATCH] Spread out and optimise player list ticksSpread out and
diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
index 72a4ceb96169552325c3c96a5bc880e7e825f37d..eebc1cf65339a4938862ac71c314519d9a369496 100644
index a4a895a54ad0266301d50f95eaec3a2bb604f8f1..cdb40088112bf86becc9f08d002d7a7c06b65df8 100644
--- a/src/main/java/net/minecraft/server/players/PlayerList.java
+++ b/src/main/java/net/minecraft/server/players/PlayerList.java
@@ -1018,22 +1018,22 @@ public abstract class PlayerList {
@@ -1021,22 +1021,22 @@ public abstract class PlayerList {
}
public void tick() {

8
patches/server/0124-Implement-TPSBar.patch
View File

@@ -41,7 +41,7 @@ index 814f24d5d38062799e51cc7e07b3f55fe59579f5..1a9b717c06ae93d996457399d35abb16
}
}
diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
index 4209f076877e560f2e0463281c0a343526cab5e4..730a2f16fe9fea9662edf502419ad57387169c8f 100644
index f9b15ed173c294827b06e07cb9afaaa31796c8d1..388bb49baa9ba913c550df8047792b8108ba4ba2 100644
--- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
+++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
@@ -262,6 +262,7 @@ public class ServerPlayer extends Player {
@@ -83,10 +83,10 @@ index 4209f076877e560f2e0463281c0a343526cab5e4..730a2f16fe9fea9662edf502419ad573
// Purpur end
}
diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
index eebc1cf65339a4938862ac71c314519d9a369496..9e7bcd0b0b736ef7b7b5aa78037d13438b47824b 100644
index cdb40088112bf86becc9f08d002d7a7c06b65df8..0f80cec6b613c4fae52cfdc868ab1f738fc1264d 100644
--- a/src/main/java/net/minecraft/server/players/PlayerList.java
+++ b/src/main/java/net/minecraft/server/players/PlayerList.java
@@ -493,6 +493,7 @@ public abstract class PlayerList {
@@ -496,6 +496,7 @@ public abstract class PlayerList {
scoreboard.addPlayerToTeam(player.getScoreboardName(), collideRuleTeam);
}
// Paper end
@@ -94,7 +94,7 @@ index eebc1cf65339a4938862ac71c314519d9a369496..9e7bcd0b0b736ef7b7b5aa78037d1343
// CraftBukkit - Moved from above, added world
PlayerList.LOGGER.info("{}[{}] logged in with entity id {} at ([{}]{}, {}, {})", player.getName().getString(), s1, player.getId(), worldserver1.serverLevelData.getLevelName(), player.getX(), player.getY(), player.getZ());
}
@@ -603,6 +604,8 @@ public abstract class PlayerList {
@@ -606,6 +607,8 @@ public abstract class PlayerList {
}
public net.kyori.adventure.text.Component remove(ServerPlayer entityplayer, net.kyori.adventure.text.Component leaveMessage) {
// Paper end

4
patches/server/0190-Allow-player-join-full-server-by-permission.patch
View File

@@ -5,10 +5,10 @@ Subject: [PATCH] Allow player join full server by permission
diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
index 9e7bcd0b0b736ef7b7b5aa78037d13438b47824b..59efd554048e766bd04442aa9720ef554d5dab25 100644
index 0f80cec6b613c4fae52cfdc868ab1f738fc1264d..1af8a30f9300e355792d0016b1ccf7eda8a64544 100644
--- a/src/main/java/net/minecraft/server/players/PlayerList.java
+++ b/src/main/java/net/minecraft/server/players/PlayerList.java
@@ -773,7 +773,7 @@ public abstract class PlayerList {
@@ -776,7 +776,7 @@ public abstract class PlayerList {
event.disallow(PlayerLoginEvent.Result.KICK_BANNED, PaperAdventure.asAdventure(ichatmutablecomponent)); // Paper - Adventure
} else {
// return this.players.size() >= this.maxPlayers && !this.canBypassPlayerLimit(gameprofile) ? IChatBaseComponent.translatable("multiplayer.disconnect.server_full") : null;

8
patches/server/0237-Signs-allow-color-codes.patch
View File

@@ -5,7 +5,7 @@ Subject: [PATCH] Signs allow color codes
diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
index 5da0ea40642d35a32e47ca0465aa3475bad36b6b..0d669ae74cf1528f2973b05da02c683807eaa967 100644
index fb213ef136c6aff278426ade1ecd301407980016..f4aef2553bc50669772c27b3423706776fc92bcc 100644
--- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
+++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
@@ -1510,6 +1510,7 @@ public class ServerPlayer extends Player {
@@ -17,7 +17,7 @@ index 5da0ea40642d35a32e47ca0465aa3475bad36b6b..0d669ae74cf1528f2973b05da02c6838
this.connection.send(new ClientboundBlockUpdatePacket(this.level, sign.getBlockPos()));
this.connection.send(new ClientboundOpenSignEditorPacket(sign.getBlockPos()));
diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
index 1c91159b2909d302c35ee8f074295bada7e50c36..dcf75f84070c8778fabea5f161bead0b96252497 100644
index c1ac9681c35b87b19a52f2306627e8f220b9c15f..a24c209150eb5a2f5b79a4e1596c376ffa58cf27 100644
--- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
+++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
@@ -3375,11 +3375,17 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
@@ -42,10 +42,10 @@ index 1c91159b2909d302c35ee8f074295bada7e50c36..dcf75f84070c8778fabea5f161bead0b
SignChangeEvent event = new SignChangeEvent((org.bukkit.craftbukkit.block.CraftBlock) player.getWorld().getBlockAt(x, y, z), this.player.getBukkitEntity(), lines);
this.cserver.getPluginManager().callEvent(event);
diff --git a/src/main/java/net/minecraft/world/level/block/entity/SignBlockEntity.java b/src/main/java/net/minecraft/world/level/block/entity/SignBlockEntity.java
index 504ee81804f3b55590ee053f50481774524bb9b1..2d5f25380a4f846a3327ac0a331cc8cc8fde3149 100644
index 517f9c6df4427f21ebac17a298a57e28d53e6fd0..3dfd00e65b8c42d0823b754031bb6028e25c24ff 100644
--- a/src/main/java/net/minecraft/world/level/block/entity/SignBlockEntity.java
+++ b/src/main/java/net/minecraft/world/level/block/entity/SignBlockEntity.java
@@ -186,6 +186,23 @@ public class SignBlockEntity extends BlockEntity implements CommandSource { // C
@@ -184,6 +184,23 @@ public class SignBlockEntity extends BlockEntity implements CommandSource { // C
return ClientboundBlockEntityDataPacket.create(this);
}