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

update paper

Browse Source
This commit is contained in:
BillyGalbreath
2021-06-16 18:03:37 -05:00
parent d7fdc8ace3
commit 6df0286ff0
7 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=net.pl3x.purpur
version=1.17-R0.1-SNAPSHOT
packageVersion=1_17_R1
paperCommit=080d3d737a7e338971ddfaefa0dc602cb4e3c3a5
paperCommit=7be3024c75339c7a226060d9ae6f80221981c9d3
org.gradle.parallel=true
org.gradle.jvmargs=-Xmx3G

10
patches/server/0003-Ridables.patch
View File

@@ -46,7 +46,7 @@ index fe6d8b93f5685b611f1f2fe6ac28a0b718e198cc..900b30c9ba0d7b9e0b19c23c1eb5b75d
return new Throwable(entity + " Added to world at " + new java.util.Date());
}
diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
index b4055c6de62c22ba8ee8384884f9b3fd62eddeb8..84c0c68e327d73e782cd451fc0d209a8b4287b2e 100644
index 5d3269c6912a23aef26d5b155c04c2cd567cefba..35390d245330b7e69daa2a386c6913a719c04a32 100644
--- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
+++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
@@ -662,6 +662,15 @@ public class ServerPlayer extends Player {
@@ -86,7 +86,7 @@ index 40d0dac02bb1922483d68f3cdd09a228f66d09f6..8e585ea6a070b2339cf396d70224a0d3
if ((entity instanceof AbstractFish && 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 ClientboundAddMobPacket((AbstractFish) entity));
diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
index aaaf5d49972ab608473637dc884dd0c802deaae0..3e2e3038bfe830a50edfee81bc4aa454a42538ec 100644
index cfab75b70b4cf4c95f3a7971c78f6dc42c0d23d0..f6f162b145bffe2d97b48b009641b0437fee5b1d 100644
--- a/src/main/java/net/minecraft/world/entity/Entity.java
+++ b/src/main/java/net/minecraft/world/entity/Entity.java
@@ -230,7 +230,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, n
@@ -126,7 +126,7 @@ index aaaf5d49972ab608473637dc884dd0c802deaae0..3e2e3038bfe830a50edfee81bc4aa454
if (this.passengers.size() == 1 && this.passengers.get(0) == entity) {
this.passengers = ImmutableList.of();
} else {
@@ -3374,6 +3388,29 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, n
@@ -3373,6 +3387,29 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, n
return SlotAccess.NULL;
}
@@ -156,7 +156,7 @@ index aaaf5d49972ab608473637dc884dd0c802deaae0..3e2e3038bfe830a50edfee81bc4aa454
@Override
public void sendMessage(Component message, UUID sender) {}
@@ -3985,4 +4022,41 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, n
@@ -3984,4 +4021,41 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, n
return ((ServerChunkCache) level.getChunkSource()).isPositionTicking(this);
}
// Paper end
@@ -260,7 +260,7 @@ index 58b36ed797476f3cec78529e09e913ebb791c5e3..e733c1e8f0b180bf1508e4f004124d44
// 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 ecd6ce01f541a2885384dac47095422b86e194fa..9438a6dfee9e3a2a4b781eff63332386fb7d6b13 100644
index 6c603926c0d582b16268fd0888bc685442e0c8cd..4c0a0ac37f59f636947f21acfd3c3b5f0d8e8b0c 100644
--- a/src/main/java/net/minecraft/world/entity/Mob.java
+++ b/src/main/java/net/minecraft/world/entity/Mob.java
@@ -139,6 +139,8 @@ public abstract class Mob extends LivingEntity {

8
patches/server/0008-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 84c0c68e327d73e782cd451fc0d209a8b4287b2e..610b1d32c34659ec8459b984cde4aa80bee89f11 100644
index 35390d245330b7e69daa2a386c6913a719c04a32..686bbbde55a61e4f78f4d0991b06b581b34ddec5 100644
--- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
+++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
@@ -1914,8 +1914,54 @@ public class ServerPlayer extends Player {
@@ -192,7 +192,7 @@ index 7bb30fba98b5b217df72e6df5b2dc4e6082d1a6a..e818682578beac89fb6b7c8cf6a2240b
}
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index 4fd7d61c5d225f0dc0666ad7219542777afe01ea..a2f482e3dbcfb93cdee2678ca963c46479670e8c 100644
index 5ad112baaa2dc0d56c0e7d36443eafd3ff0dc2c8..d30717155d055431f1de0b2de747ea98dee0b06e 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -57,6 +57,17 @@ public class PurpurWorldConfig {
@@ -214,10 +214,10 @@ index 4fd7d61c5d225f0dc0666ad7219542777afe01ea..a2f482e3dbcfb93cdee2678ca963c464
public boolean untamedTamablesAreRidable = true;
public boolean useNightVisionWhenRiding = false;
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
index 05007190441117fe8b2f8b54fc37e589ffc213dc..04b49b0d570d3049ffa756376e2f374a98335b67 100644
index 3f0096423ba5db02c1007a8547d8a0497597055f..ae1c605dc3e35117e754884581364cf932670420 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -2453,4 +2453,21 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -2471,4 +2471,21 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
return this.spigot;
}
// Spigot end

4
patches/server/0014-PlayerSetSpawnerTypeWithEggEvent.patch
View File

@@ -5,7 +5,7 @@ Subject: [PATCH] PlayerSetSpawnerTypeWithEggEvent
diff --git a/src/main/java/net/minecraft/world/entity/EntityType.java b/src/main/java/net/minecraft/world/entity/EntityType.java
index 2b82859d4ac43036e346220333e676998742d56d..87211af4cf638f4b6042548c030ec8927a28d760 100644
index 536d979139326191d1199e93e9fc885164766aec..81ec8304da9006ea8450bde441bdb20898f8ca5c 100644
--- a/src/main/java/net/minecraft/world/entity/EntityType.java
+++ b/src/main/java/net/minecraft/world/entity/EntityType.java
@@ -287,6 +287,16 @@ public class EntityType<T extends Entity> implements EntityTypeTest<Entity, T> {
@@ -25,7 +25,7 @@ index 2b82859d4ac43036e346220333e676998742d56d..87211af4cf638f4b6042548c030ec892
public static ResourceLocation getKey(EntityType<?> type) {
return Registry.ENTITY_TYPE.getKey(type);
}
@@ -453,6 +463,16 @@ public class EntityType<T extends Entity> implements EntityTypeTest<Entity, T> {
@@ -452,6 +462,16 @@ public class EntityType<T extends Entity> implements EntityTypeTest<Entity, T> {
return this.category;
}

8
patches/server/0016-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 610b1d32c34659ec8459b984cde4aa80bee89f11..4816fd89517802dd00b37385d92e6711678ae373 100644
index 686bbbde55a61e4f78f4d0991b06b581b34ddec5..4ab52c4bca5c938ef8667acfb41bcceec1c5a89b 100644
--- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
+++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
@@ -332,6 +332,7 @@ public class ServerPlayer extends Player {
@@ -90,7 +90,7 @@ index d6ecf7671663957b27ee0cadbfc57ce3a7be161c..bcff95d97549f56f542644f8348a8408
return entityplayer1;
}
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index a2f482e3dbcfb93cdee2678ca963c46479670e8c..3a4ac9c75b4517bb6fdad67d1db5e4ac805f3ee4 100644
index d30717155d055431f1de0b2de747ea98dee0b06e..a3704ec4d0ca71e7225ed49395dbc7a869452693 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -68,6 +68,13 @@ public class PurpurWorldConfig {
@@ -108,10 +108,10 @@ index a2f482e3dbcfb93cdee2678ca963c46479670e8c..3a4ac9c75b4517bb6fdad67d1db5e4ac
public boolean untamedTamablesAreRidable = true;
public boolean useNightVisionWhenRiding = false;
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
index 04b49b0d570d3049ffa756376e2f374a98335b67..19f6bbf8e63c1f3f7391fe85fb283b8ee4fbfccc 100644
index ae1c605dc3e35117e754884581364cf932670420..830a17bb29123b7ce84ebd6b44a4ebc28ea94954 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -2469,5 +2469,20 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -2487,5 +2487,20 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
public void resetIdleTimer() {
getHandle().resetLastActionTime();
}

6
patches/server/0031-Dont-send-useless-entity-packets.patch
View File

@@ -5,10 +5,10 @@ Subject: [PATCH] Dont send useless entity packets
diff --git a/src/main/java/net/minecraft/server/level/ServerEntity.java b/src/main/java/net/minecraft/server/level/ServerEntity.java
index 8ea4209400489116823eced292d8cd9654a1c809..d19a025337c4b0a2965184b4c872f23d15a4a60b 100644
index 44aa0c4ec6f0e4df2541c74fa7de852dae59bda5..1b649cb81712bd145cbbb033bcdef6f1345f843b 100644
--- a/src/main/java/net/minecraft/server/level/ServerEntity.java
+++ b/src/main/java/net/minecraft/server/level/ServerEntity.java
@@ -189,6 +189,7 @@ public class ServerEntity {
@@ -188,6 +188,7 @@ public class ServerEntity {
this.teleportDelay = 0;
packet1 = new ClientboundTeleportEntityPacket(this.entity);
}
@@ -16,7 +16,7 @@ index 8ea4209400489116823eced292d8cd9654a1c809..d19a025337c4b0a2965184b4c872f23d
}
if ((this.trackDelta || this.entity.hasImpulse || this.entity instanceof LivingEntity && ((LivingEntity) this.entity).isFallFlying()) && this.tickCount > 0) {
@@ -257,6 +258,22 @@ public class ServerEntity {
@@ -256,6 +257,22 @@ public class ServerEntity {
}

6
patches/server/0061-Allow-leashing-villagers.patch
View File

@@ -5,7 +5,7 @@ Subject: [PATCH] Allow leashing villagers
diff --git a/src/main/java/net/minecraft/world/entity/Mob.java b/src/main/java/net/minecraft/world/entity/Mob.java
index f605b87f8d0ea0f3646ab856e8fbf12a25c24594..0cbc90a8c1277a0f35e6636ca73b134b22544db3 100644
index 454c124d1fd21f67795027e55063b08a331adf5f..3348c6b27d2a39f66dbaf3f2920160d9d56705aa 100644
--- a/src/main/java/net/minecraft/world/entity/Mob.java
+++ b/src/main/java/net/minecraft/world/entity/Mob.java
@@ -47,6 +47,7 @@ import net.minecraft.world.entity.decoration.HangingEntity;
@@ -20,7 +20,7 @@ index f605b87f8d0ea0f3646ab856e8fbf12a25c24594..0cbc90a8c1277a0f35e6636ca73b134b
if (!this.isAlive()) {
return InteractionResult.PASS;
} else if (this.getLeashHolder() == player) {
+ if (hand == InteractionHand.OFF_HAND && (level.purpurConfig.villagerCanBeLeashed || level.purpurConfig.villagerTraderCanBeLeashed) && this instanceof AbstractVillager) return InteractionResult.CONSUME; // Purpur
+ if (hand == InteractionHand.OFF_HAND && (level.purpurConfig.villagerCanBeLeashed || level.purpurConfig.wanderingTraderCanBeLeashed) && this instanceof AbstractVillager) return InteractionResult.CONSUME; // Purpur
// CraftBukkit start - fire PlayerUnleashEntityEvent
// Paper start - drop leash variable
org.bukkit.event.player.PlayerUnleashEntityEvent event = CraftEventFactory.callPlayerUnleashEntityEvent(this, player, !player.getAbilities().instabuild);
@@ -67,7 +67,7 @@ index 05fc739b8dfe2ec74a2b070f5cdcd945f5b04b1a..f879faf7ebe01697ab36247dacdd46d4
@Override
public AgeableMob getBreedOffspring(ServerLevel world, AgeableMob entity) {
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index a53f827843407ae4c8c6252796af66da41683caa..ab902dc191c7bb0d90e7f3e6b045a017c8b50577 100644
index 7661b2e30ff3deaa574b6327582c7463608d14ff..18283fbbec790955a1f0d2e9e5ebf991f19ae763 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
@@ -718,6 +718,7 @@ public class PurpurWorldConfig {