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

Updated Upstream (Paper)

Browse Source 
Upstream has released updates that appear to apply and compile correctly

Paper Changes:
PaperMC/Paper@ef0e5a6 Updated Upstream (Bukkit/CraftBukkit/Spigot)
This commit is contained in:
BillyGalbreath
2022-09-13 17:32:56 -05:00
parent 664774af5a
commit 6e7bb8323f
40 changed files with 170 additions and 170 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
patches/server/0289-Remove-Mojang-Profiler.patch
View File

@@ -835,7 +835,7 @@ index 4d28a1f9fe43bb8e9f5ffaf06895c94fa0749d5d..08c46cdc626e89fed0d769d50735e983
this.connection.send(new ClientboundPlayerAbilitiesPacket(this.getAbilities()));
playerlist.sendLevelInfo(this, worldserver);
diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
index 166fd17d03d84cd3ea5917c17e6b9549a46295e0..48224c850e5be223971b76a4e580b95585208ea6 100644
index 7a0adbdcadd20269e92cb698b569f04b169dade4..72cb935faed7c96d6759c020b48a9e66be99dbfd 100644
--- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
+++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
@@ -416,7 +416,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
@@ -1061,7 +1061,7 @@ index 5725c6593480fada65facc29664a00a8cc073512..ccb1f998ae3122d1856d77149ff7e7df
};
}
diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
index 59905d8d5e446ff694fe70edec8df1d92e27aa40..0cdac68d20a77948ef7dd4072b3db039e280c567 100644
index 34c823876efc78a5f5fe111b3d10e5240f76215f..ffbe6f3b5fdd60332627fdb6a7ea050d21ad8cdb 100644
--- a/src/main/java/net/minecraft/world/entity/Entity.java
+++ b/src/main/java/net/minecraft/world/entity/Entity.java
@@ -821,7 +821,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
@@ -1129,7 +1129,7 @@ index 59905d8d5e446ff694fe70edec8df1d92e27aa40..0cdac68d20a77948ef7dd4072b3db039
}
}
// Paper start - detailed watchdog information
@@ -2902,7 +2902,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
@@ -2916,7 +2916,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
ServerLevel worldserver1 = minecraftserver.getLevel(resourcekey);
if (true && !this.isPassenger() && this.portalTime++ >= i) { // CraftBukkit
@@ -1138,7 +1138,7 @@ index 59905d8d5e446ff694fe70edec8df1d92e27aa40..0cdac68d20a77948ef7dd4072b3db039
this.portalTime = i;
// Paper start
io.papermc.paper.event.entity.EntityPortalReadyEvent event = new io.papermc.paper.event.entity.EntityPortalReadyEvent(this.getBukkitEntity(), worldserver1 == null ? null : worldserver1.getWorld(), org.bukkit.PortalType.NETHER);
@@ -2920,7 +2920,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
@@ -2934,7 +2934,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
}
} // Paper
// CraftBukkit end
@@ -1147,7 +1147,7 @@ index 59905d8d5e446ff694fe70edec8df1d92e27aa40..0cdac68d20a77948ef7dd4072b3db039
}
this.isInsidePortal = false;
@@ -3374,14 +3374,14 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
@@ -3388,14 +3388,14 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
}
// Paper end
if (this.level instanceof ServerLevel && !this.isRemoved()) {
@@ -1164,7 +1164,7 @@ index 59905d8d5e446ff694fe70edec8df1d92e27aa40..0cdac68d20a77948ef7dd4072b3db039
PortalInfo shapedetectorshape = (location == null) ? this.findDimensionEntryPoint(worldserver) : new PortalInfo(new Vec3(location.x(), location.y(), location.z()), Vec3.ZERO, this.yRot, this.xRot, worldserver, null); // CraftBukkit
if (shapedetectorshape == null) {
@@ -3415,7 +3415,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
@@ -3429,7 +3429,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
this.unRide();
// CraftBukkit end
@@ -1173,7 +1173,7 @@ index 59905d8d5e446ff694fe70edec8df1d92e27aa40..0cdac68d20a77948ef7dd4072b3db039
// Paper start - Change lead drop timing to prevent dupe
if (this instanceof Mob) {
((Mob) this).dropLeash(true, true); // Paper drop lead
@@ -3438,10 +3438,10 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
@@ -3452,10 +3452,10 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
}
this.removeAfterChangingDimensions();
@@ -1187,7 +1187,7 @@ index 59905d8d5e446ff694fe70edec8df1d92e27aa40..0cdac68d20a77948ef7dd4072b3db039
}
} else {
diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
index 89c47c71eb94df0f54e70dc41aea2fa00c3f262f..cd414a9275e6d9f8c704854763b18f4ee43b67b7 100644
index b37d3f293cf73730626f0a7da84058f42f071181..8f80b2f14c582d248988a824193d1fd0df177dc5 100644
--- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
+++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
@@ -397,7 +397,7 @@ public abstract class LivingEntity extends Entity {
@@ -1208,7 +1208,7 @@ index 89c47c71eb94df0f54e70dc41aea2fa00c3f262f..cd414a9275e6d9f8c704854763b18f4e
}
public boolean canSpawnSoulSpeedParticle() {
@@ -3065,10 +3065,10 @@ public abstract class LivingEntity extends Entity {
@@ -3087,10 +3087,10 @@ public abstract class LivingEntity extends Entity {
}
this.run += (f3 - this.run) * 0.3F;
@@ -1222,7 +1222,7 @@ index 89c47c71eb94df0f54e70dc41aea2fa00c3f262f..cd414a9275e6d9f8c704854763b18f4e
while (this.getYRot() - this.yRotO < -180.0F) {
this.yRotO -= 360.0F;
@@ -3102,7 +3102,7 @@ public abstract class LivingEntity extends Entity {
@@ -3124,7 +3124,7 @@ public abstract class LivingEntity extends Entity {
this.yHeadRotO += 360.0F;
}
@@ -1231,7 +1231,7 @@ index 89c47c71eb94df0f54e70dc41aea2fa00c3f262f..cd414a9275e6d9f8c704854763b18f4e
this.animStep += f2;
if (this.isFallFlying()) {
++this.fallFlyTicks;
@@ -3384,19 +3384,19 @@ public abstract class LivingEntity extends Entity {
@@ -3406,19 +3406,19 @@ public abstract class LivingEntity extends Entity {
}
this.setDeltaMovement(d4, d5, d6);
@@ -1256,7 +1256,7 @@ index 89c47c71eb94df0f54e70dc41aea2fa00c3f262f..cd414a9275e6d9f8c704854763b18f4e
if (this.jumping && this.isAffectedByFluids()) {
double d7;
@@ -3423,8 +3423,8 @@ public abstract class LivingEntity extends Entity {
@@ -3445,8 +3445,8 @@ public abstract class LivingEntity extends Entity {
this.noJumpDelay = 0;
}
@@ -1267,7 +1267,7 @@ index 89c47c71eb94df0f54e70dc41aea2fa00c3f262f..cd414a9275e6d9f8c704854763b18f4e
this.xxa *= 0.98F;
this.zza *= 0.98F;
this.updateFallFlying();
@@ -3433,8 +3433,8 @@ public abstract class LivingEntity extends Entity {
@@ -3455,8 +3455,8 @@ public abstract class LivingEntity extends Entity {
// SpigotTimings.timerEntityAIMove.startTiming(); // Spigot // Paper
this.travel(new Vec3((double) this.xxa, (double) this.yya, (double) this.zza));
// SpigotTimings.timerEntityAIMove.stopTiming(); // Spigot // Paper
@@ -1278,7 +1278,7 @@ index 89c47c71eb94df0f54e70dc41aea2fa00c3f262f..cd414a9275e6d9f8c704854763b18f4e
boolean flag1 = this.getType().is(EntityTypeTags.FREEZE_HURTS_EXTRA_TYPES);
int i;
@@ -3454,15 +3454,15 @@ public abstract class LivingEntity extends Entity {
@@ -3476,15 +3476,15 @@ public abstract class LivingEntity extends Entity {
this.hurt(DamageSource.FREEZE, (float) i);
}
@@ -1298,7 +1298,7 @@ index 89c47c71eb94df0f54e70dc41aea2fa00c3f262f..cd414a9275e6d9f8c704854763b18f4e
// Purpur start
if (this.xo != this.getX() || this.yo != this.getY() || this.zo != this.getZ() || this.yRotO != this.getYRot() || this.xRotO != this.getXRot()) {
diff --git a/src/main/java/net/minecraft/world/entity/Mob.java b/src/main/java/net/minecraft/world/entity/Mob.java
index 34db1bd524bb97fbbe0f86b088a2ac343e730f5e..b75243eca01cae108093368e426ea2d6b6ef1057 100644
index 9ae5053c9c6591bdd8349e434ef505e64048b881..ec4f04327eb875989af4d7da0171e2000fadef6b 100644
--- a/src/main/java/net/minecraft/world/entity/Mob.java
+++ b/src/main/java/net/minecraft/world/entity/Mob.java
@@ -332,14 +332,14 @@ public abstract class Mob extends LivingEntity {
@@ -1318,7 +1318,7 @@ index 34db1bd524bb97fbbe0f86b088a2ac343e730f5e..b75243eca01cae108093368e426ea2d6
}
// Purpur start
@@ -663,7 +663,7 @@ public abstract class Mob extends LivingEntity {
@@ -669,7 +669,7 @@ public abstract class Mob extends LivingEntity {
@Override
public void aiStep() {
super.aiStep();
@@ -1327,7 +1327,7 @@ index 34db1bd524bb97fbbe0f86b088a2ac343e730f5e..b75243eca01cae108093368e426ea2d6
if (!this.level.isClientSide && this.canPickUpLoot() && this.isAlive() && !this.dead && (this.level.purpurConfig.entitiesPickUpLootBypassMobGriefing || this.level.getGameRules().getBoolean(GameRules.RULE_MOBGRIEFING))) {
Vec3i baseblockposition = this.getPickupReach();
List<ItemEntity> list = this.level.getEntitiesOfClass(ItemEntity.class, this.getBoundingBox().inflate((double) baseblockposition.getX(), (double) baseblockposition.getY(), (double) baseblockposition.getZ()));
@@ -683,7 +683,7 @@ public abstract class Mob extends LivingEntity {
@@ -689,7 +689,7 @@ public abstract class Mob extends LivingEntity {
}
}
@@ -1336,7 +1336,7 @@ index 34db1bd524bb97fbbe0f86b088a2ac343e730f5e..b75243eca01cae108093368e426ea2d6
}
protected Vec3i getPickupReach() {
@@ -878,46 +878,46 @@ public abstract class Mob extends LivingEntity {
@@ -884,46 +884,46 @@ public abstract class Mob extends LivingEntity {
return;
}
// Paper end