SteamWar/Paper
10
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update to Minecraft 1.19.3

Browse Source 
By: md_5 <git@md-5.net>
This commit is contained in:
CraftBukkit/Spigot
2022-12-08 03:00:00 +11:00
parent a13136ada2
commit 8b26bb8f3e
305 changed files with 3331 additions and 2864 deletions
Download Patch File Download Diff File Expand all files Collapse all files

62
paper-server/nms-patches/net/minecraft/world/entity/Entity.patch
View File

@@ -253,7 +253,7 @@
if (this.onGround) {
block.stepOn(this.level, blockposition, iblockdata, this);
}
@@ -938,6 +1114,20 @@
@@ -946,6 +1122,20 @@
return SoundEffects.GENERIC_SPLASH;
}
@@ -273,8 +273,8 @@
+
protected void checkInsideBlocks() {
AxisAlignedBB axisalignedbb = this.getBoundingBox();
BlockPosition blockposition = new BlockPosition(axisalignedbb.minX + 0.001D, axisalignedbb.minY + 0.001D, axisalignedbb.minZ + 0.001D);
@@ -1290,6 +1480,7 @@
BlockPosition blockposition = new BlockPosition(axisalignedbb.minX + 1.0E-7D, axisalignedbb.minY + 1.0E-7D, axisalignedbb.minZ + 1.0E-7D);
@@ -1305,6 +1495,7 @@
this.yo = d1;
this.zo = d4;
this.setPos(d3, d1, d4);
@@ -282,7 +282,7 @@
}
public void moveTo(Vec3D vec3d) {
@@ -1480,6 +1671,12 @@
@@ -1495,6 +1686,12 @@
return false;
}
@@ -295,7 +295,7 @@
public void awardKillScore(Entity entity, int i, DamageSource damagesource) {
if (entity instanceof EntityPlayer) {
CriterionTriggers.ENTITY_KILLED_PLAYER.trigger((EntityPlayer) entity, this, damagesource);
@@ -1513,7 +1710,7 @@
@@ -1528,7 +1725,7 @@
} else {
String s = this.getEncodeId();
@@ -304,7 +304,7 @@
return false;
} else {
nbttagcompound.putString("id", s);
@@ -1538,6 +1735,18 @@
@@ -1553,6 +1750,18 @@
Vec3D vec3d = this.getDeltaMovement();
nbttagcompound.put("Motion", this.newDoubleList(vec3d.x, vec3d.y, vec3d.z));
@@ -323,7 +323,7 @@
nbttagcompound.put("Rotation", this.newFloatList(this.getYRot(), this.getXRot()));
nbttagcompound.putFloat("FallDistance", this.fallDistance);
nbttagcompound.putShort("Fire", (short) this.remainingFireTicks);
@@ -1546,6 +1755,22 @@
@@ -1561,6 +1770,22 @@
nbttagcompound.putBoolean("Invulnerable", this.invulnerable);
nbttagcompound.putInt("PortalCooldown", this.portalCooldown);
nbttagcompound.putUUID("UUID", this.getUUID());
@@ -346,7 +346,7 @@
IChatBaseComponent ichatbasecomponent = this.getCustomName();
if (ichatbasecomponent != null) {
@@ -1613,6 +1838,11 @@
@@ -1628,6 +1853,11 @@
}
}
@@ -358,7 +358,7 @@
return nbttagcompound;
} catch (Throwable throwable) {
CrashReport crashreport = CrashReport.forThrowable(throwable, "Saving entity NBT");
@@ -1696,6 +1926,44 @@
@@ -1711,6 +1941,44 @@
} else {
throw new IllegalStateException("Entity has invalid position");
}
@@ -403,7 +403,7 @@
} catch (Throwable throwable) {
CrashReport crashreport = CrashReport.forThrowable(throwable, "Loading entity NBT");
CrashReportSystemDetails crashreportsystemdetails = crashreport.addCategory("Entity being loaded");
@@ -1771,9 +2039,22 @@
@@ -1786,9 +2054,22 @@
} else if (this.level.isClientSide) {
return null;
} else {
@@ -426,7 +426,7 @@
this.level.addFreshEntity(entityitem);
return entityitem;
}
@@ -1867,7 +2148,7 @@
@@ -1882,7 +2163,7 @@
this.setPose(EntityPose.STANDING);
this.vehicle = entity;
@@ -435,7 +435,7 @@
entity.getIndirectPassengersStream().filter((entity2) -> {
return entity2 instanceof EntityPlayer;
}).forEach((entity2) -> {
@@ -1898,7 +2179,7 @@
@@ -1913,7 +2194,7 @@
Entity entity = this.vehicle;
this.vehicle = null;
@@ -444,7 +444,7 @@
}
}
@@ -1907,10 +2188,31 @@
@@ -1926,10 +2207,31 @@
this.removeVehicle();
}
@@ -477,7 +477,7 @@
if (this.passengers.isEmpty()) {
this.passengers = ImmutableList.of(entity);
} else {
@@ -1926,12 +2228,32 @@
@@ -1945,12 +2247,32 @@
}
}
@@ -511,7 +511,7 @@
if (this.passengers.size() == 1 && this.passengers.get(0) == entity) {
this.passengers = ImmutableList.of();
} else {
@@ -1942,6 +2264,7 @@
@@ -1961,6 +2283,7 @@
entity.boardingCooldown = 60;
}
@@ -519,7 +519,7 @@
}
protected boolean canAddPassenger(Entity entity) {
@@ -2004,14 +2327,20 @@
@@ -2023,14 +2346,20 @@
if (this.isInsidePortal) {
MinecraftServer minecraftserver = worldserver.getServer();
@@ -543,7 +543,7 @@
this.level.getProfiler().pop();
}
@@ -2129,6 +2458,13 @@
@@ -2148,6 +2477,13 @@
}
public void setSwimming(boolean flag) {
@@ -557,7 +557,7 @@
this.setSharedFlag(4, flag);
}
@@ -2174,8 +2510,12 @@
@@ -2193,8 +2529,12 @@
return this.getTeam() != null ? this.getTeam().isAlliedTo(scoreboardteambase) : false;
}
@@ -571,7 +571,7 @@
}
public boolean getSharedFlag(int i) {
@@ -2194,7 +2534,7 @@
@@ -2213,7 +2553,7 @@
}
public int getMaxAirSupply() {
@@ -580,7 +580,7 @@
}
public int getAirSupply() {
@@ -2202,7 +2542,18 @@
@@ -2221,7 +2561,18 @@
}
public void setAirSupply(int i) {
@@ -600,7 +600,7 @@
}
public int getTicksFrozen() {
@@ -2229,11 +2580,41 @@
@@ -2248,11 +2599,41 @@
public void thunderHit(WorldServer worldserver, EntityLightning entitylightning) {
this.setRemainingFireTicks(this.remainingFireTicks + 1);
@@ -644,7 +644,7 @@
}
public void onAboveBubbleCol(boolean flag) {
@@ -2391,15 +2772,38 @@
@@ -2417,15 +2798,38 @@
@Nullable
public Entity changeDimension(WorldServer worldserver) {
@@ -685,7 +685,7 @@
this.level.getProfiler().popPush("reloading");
Entity entity = this.getType().create(worldserver);
@@ -2408,9 +2812,17 @@
@@ -2434,9 +2838,17 @@
entity.moveTo(shapedetectorshape.pos.x, shapedetectorshape.pos.y, shapedetectorshape.pos.z, shapedetectorshape.yRot, entity.getXRot());
entity.setDeltaMovement(shapedetectorshape.speed);
worldserver.addDuringTeleport(entity);
@@ -705,7 +705,7 @@
}
this.removeAfterChangingDimensions();
@@ -2431,20 +2843,34 @@
@@ -2457,20 +2869,34 @@
@Nullable
protected ShapeDetectorShape findDimensionEntryPoint(WorldServer worldserver) {
@@ -745,18 +745,18 @@
IBlockData iblockdata = this.level.getBlockState(this.portalEntrancePos);
EnumDirection.EnumAxis enumdirection_enumaxis;
Vec3D vec3d;
@@ -2461,8 +2887,8 @@
@@ -2487,8 +2913,8 @@
vec3d = new Vec3D(0.5D, 0.0D, 0.0D);
}
- return BlockPortalShape.createPortalInfo(worldserver, blockutil_rectangle, enumdirection_enumaxis, vec3d, this.getDimensions(this.getPose()), this.getDeltaMovement(), this.getYRot(), this.getXRot());
- return BlockPortalShape.createPortalInfo(worldserver, blockutil_rectangle, enumdirection_enumaxis, vec3d, this, this.getDeltaMovement(), this.getYRot(), this.getXRot());
- }).orElse((Object) null);
+ return BlockPortalShape.createPortalInfo(worldserverFinal, blockutil_rectangle, enumdirection_enumaxis, vec3d, this.getDimensions(this.getPose()), this.getDeltaMovement(), this.getYRot(), this.getXRot(), event); // CraftBukkit
+ return BlockPortalShape.createPortalInfo(worldserverFinal, blockutil_rectangle, enumdirection_enumaxis, vec3d, this, this.getDeltaMovement(), this.getYRot(), this.getXRot(), event); // CraftBukkit
+ }).orElse(null); // CraftBukkit - decompile error
}
} else {
BlockPosition blockposition1;
@@ -2472,8 +2898,14 @@
@@ -2498,8 +2924,14 @@
} else {
blockposition1 = worldserver.getHeightmapPos(HeightMap.Type.MOTION_BLOCKING_NO_LEAVES, worldserver.getSharedSpawnPos());
}
@@ -772,7 +772,7 @@
}
}
@@ -2481,8 +2913,23 @@
@@ -2507,8 +2939,23 @@
return BlockPortalShape.getRelativePosition(blockutil_rectangle, enumdirection_enumaxis, this.position(), this.getDimensions(this.getPose()));
}
@@ -798,7 +798,7 @@
}
public boolean canChangeDimensions() {
@@ -2691,7 +3138,26 @@
@@ -2731,7 +3178,26 @@
}
public final void setBoundingBox(AxisAlignedBB axisalignedbb) {
@@ -826,7 +826,7 @@
}
protected float getEyeHeight(EntityPose entitypose, EntitySize entitysize) {
@@ -2979,6 +3445,11 @@
@@ -3023,6 +3489,11 @@
vec3d = vec3d.add(vec3d1);
++k1;
}