Skip to content
This repository has been archived by the owner on Apr 21, 2023. It is now read-only.

Commit

Permalink
Merge branch 'ver/1.19.2' of https://github.com/PrismarineTeam/Prisma…
Browse files Browse the repository at this point in the history
…rine into dev/rewrite-chunk-system
  • Loading branch information
AlphaKR93 committed Sep 18, 2022
2 parents 7db12e8 + a3fe863 commit bc7dc3b
Show file tree
Hide file tree
Showing 4 changed files with 12 additions and 12 deletions.
2 changes: 1 addition & 1 deletion gradle.properties
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
group = net.prismarineteam.prismarine
version = 1.19.2-R0.1-SNAPSHOT

paperCommit = 36f0c1b3cc1037f50dc2abe0f2319eab0c4be4b7
paperCommit = f5f84ff476fff9c1f3f3f755a7045af9a0e32da1

org.gradle.caching = true
org.gradle.parallel = true
Expand Down
6 changes: 3 additions & 3 deletions patches/api/0002-Purpur-API-Changes.patch
Original file line number Diff line number Diff line change
Expand Up @@ -1295,10 +1295,10 @@ index d23226ccb0f6c25028f000ce31346cd0a8898e6a..1ef9479c962b3f4f6fed46671a1209c3
+ // Purpur end
}
diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
index b607c229cfb1e95b17b6a0073380089ef5e1b675..8ab346562c23ff2c14727408e61e75e324885e67 100644
index 5e51bc9176b481ec70fd7e5ac23d04d59f8d1a9a..f50c61a8c375af03f3f0f5469e376e3f9c19f03e 100644
--- a/src/main/java/org/bukkit/entity/Player.java
+++ b/src/main/java/org/bukkit/entity/Player.java
@@ -2375,6 +2375,14 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
@@ -2387,6 +2387,14 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
*/
public void showDemoScreen();

Expand All @@ -1313,7 +1313,7 @@ index b607c229cfb1e95b17b6a0073380089ef5e1b675..8ab346562c23ff2c14727408e61e75e3
/**
* Gets whether the player has the "Allow Server Listings" setting enabled.
*
@@ -2796,4 +2804,137 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
@@ -2808,4 +2816,137 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
@Override
Spigot spigot();
// Spigot end
Expand Down
12 changes: 6 additions & 6 deletions patches/server/0005-Purpur-Server-Changes.patch
Original file line number Diff line number Diff line change
Expand Up @@ -20040,7 +20040,7 @@ index ae05f526f9ec70a2992ef3ee66b7f57eca2351fc..b010d7398c657367651fc576af5b0514
+ // Purpur end
}
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
index 41258fcfa0505500665c2f185b9ef6d050213355..cac6bd2f6ee4e9603a860ca7ddabbe7d002daa53 100644
index 4ba927b4585ca56337fa763d60d21de3b58bb2f7..3b5ff0b3013a10b5515b13d1b660ec421531d772 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 {
Expand All @@ -20060,7 +20060,7 @@ index 41258fcfa0505500665c2f185b9ef6d050213355..cac6bd2f6ee4e9603a860ca7ddabbe7d
for (ServerPlayer player : (List<ServerPlayer>) server.getHandle().players) {
if (player.getBukkitEntity().canSee(this)) {
player.connection.send(new ClientboundPlayerInfoPacket(ClientboundPlayerInfoPacket.Action.UPDATE_DISPLAY_NAME, this.getHandle()));
@@ -1250,6 +1255,10 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -1257,6 +1262,10 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
}

if (entity.isVehicle() && !ignorePassengers) { // Paper - Teleport API
Expand All @@ -20071,7 +20071,7 @@ index 41258fcfa0505500665c2f185b9ef6d050213355..cac6bd2f6ee4e9603a860ca7ddabbe7d
return false;
}

@@ -1833,7 +1842,13 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -1840,7 +1849,13 @@ public class CraftPlayer extends CraftHumanEntity implements Player {

@Override
public boolean canSee(org.bukkit.entity.Entity entity) {
Expand All @@ -20086,7 +20086,7 @@ index 41258fcfa0505500665c2f185b9ef6d050213355..cac6bd2f6ee4e9603a860ca7ddabbe7d
}

@Override
@@ -2197,6 +2212,28 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -2204,6 +2219,28 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
return this.getHandle().getAbilities().walkingSpeed * 2f;
}

Expand Down Expand Up @@ -20115,7 +20115,7 @@ index 41258fcfa0505500665c2f185b9ef6d050213355..cac6bd2f6ee4e9603a860ca7ddabbe7d
private void validateSpeed(float value) {
if (value < 0) {
if (value < -1f) {
@@ -2563,6 +2600,13 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -2570,6 +2607,13 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
this.getHandle().connection.send(new ClientboundGameEventPacket(ClientboundGameEventPacket.DEMO_EVENT, ClientboundGameEventPacket.DEMO_PARAM_INTRO));
}

Expand All @@ -20129,7 +20129,7 @@ index 41258fcfa0505500665c2f185b9ef6d050213355..cac6bd2f6ee4e9603a860ca7ddabbe7d
@Override
public boolean isAllowingServerListings() {
return this.getHandle().allowsListing();
@@ -2887,4 +2931,93 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -2894,4 +2938,93 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
return this.spigot;
}
// Spigot end
Expand Down
4 changes: 2 additions & 2 deletions patches/server/0012-Slice-Server-Patches.patch
Original file line number Diff line number Diff line change
Expand Up @@ -265,10 +265,10 @@ index c66135f75f95a10dd49cfb67ed8d84317715193d..1aa9cc0c1d994f6c702360ae95a6a1c0
}
\ No newline at end of file
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
index cac6bd2f6ee4e9603a860ca7ddabbe7d002daa53..c9213ddf974dd03ab8aa1fbbb9c146565f2b18db 100644
index 3b5ff0b3013a10b5515b13d1b660ec421531d772..6c0cc34f30feae71c9fb95f1f5da3ffb7083bfaf 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -2334,7 +2334,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -2341,7 +2341,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
this.sendHealthUpdate();
}
}
Expand Down

0 comments on commit bc7dc3b

Please sign in to comment.