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

Update to Minecraft 1.13.1

Browse Source 
By: md_5 <git@md-5.net>
This commit is contained in:
CraftBukkit/Spigot
2018-08-26 12:00:00 +10:00
parent 034c12d001
commit f578d94680
182 changed files with 1891 additions and 1879 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftArrow.java
View File

@@ -7,8 +7,8 @@ import org.apache.commons.lang.Validate;
import org.bukkit.block.Block;
import org.bukkit.craftbukkit.CraftServer;
import org.bukkit.entity.Arrow;
import org.bukkit.entity.Entity;
import org.bukkit.entity.EntityType;
import org.bukkit.entity.LivingEntity;
import org.bukkit.projectiles.ProjectileSource;
public class CraftArrow extends AbstractProjectile implements Arrow {
@@ -39,10 +39,10 @@ public class CraftArrow extends AbstractProjectile implements Arrow {
}
public void setShooter(ProjectileSource shooter) {
if (shooter instanceof LivingEntity) {
getHandle().shooter = ((CraftLivingEntity) shooter).getHandle();
if (shooter instanceof Entity) {
getHandle().setShooter(((CraftEntity) shooter).getHandle());
} else {
getHandle().shooter = null;
getHandle().setShooter(null);
}
getHandle().projectileSource = shooter;
}

2
paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java
View File

@@ -192,7 +192,7 @@ public class CraftHumanEntity extends CraftLivingEntity implements HumanEntity {
if (iinventory instanceof ITileInventory) {
if (iinventory instanceof TileEntity) {
TileEntity te = (TileEntity) iinventory;
if (!te.u()) { // PAIL rename hasWorld
if (!te.hasWorld()) {
te.setWorld(getHandle().world);
}
}

2
paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
View File

@@ -480,7 +480,7 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
@Override
public boolean isRiptiding() {
return getHandle().cO();
return getHandle().isRiptiding();
}
@Override

4
paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftMinecartContainer.java
View File

@@ -28,7 +28,7 @@ public abstract class CraftMinecartContainer extends CraftMinecart implements Lo
@Override
public LootTable getLootTable() {
MinecraftKey nmsTable = getHandle().Q_(); // PAIL getLootTable
MinecraftKey nmsTable = getHandle().getLootTable();
if (nmsTable == null) {
return null; // return empty loot table?
}
@@ -44,7 +44,7 @@ public abstract class CraftMinecartContainer extends CraftMinecart implements Lo
@Override
public long getSeed() {
return getHandle().d; // PAIL rename lootTableSeed
return getHandle().lootTableSeed;
}
private void setLootTable(LootTable table, long seed) {

12
paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftMob.java
View File

@@ -43,26 +43,26 @@ public abstract class CraftMob extends CraftLivingEntity implements Mob {
@Override
public void setLootTable(LootTable table) {
getHandle().bI = (table == null) ? null : CraftNamespacedKey.toMinecraft(table.getKey()); // PAIL rename lootTableKey
getHandle().lootTableKey = (table == null) ? null : CraftNamespacedKey.toMinecraft(table.getKey());
}
@Override
public LootTable getLootTable() {
if (getHandle().bI == null) {
getHandle().bI = getHandle().getLootTable(); // Restore to entity default
if (getHandle().lootTableKey == null) {
getHandle().lootTableKey = getHandle().getLootTable();
}
NamespacedKey key = CraftNamespacedKey.fromMinecraft(getHandle().bI); // PAIL rename lootTableKey
NamespacedKey key = CraftNamespacedKey.fromMinecraft(getHandle().lootTableKey);
return Bukkit.getLootTable(key);
}
@Override
public void setSeed(long seed) {
getHandle().bJ = seed; // PAIL rename lootTableSeed
getHandle().lootTableSeed = seed;
}
@Override
public long getSeed() {
return getHandle().bJ; // PAIL rename lootTableSeed
return getHandle().lootTableSeed;
}
}

4
paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
View File

@@ -266,8 +266,8 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
if (getHandle().playerConnection == null) return;
PacketPlayOutPlayerListHeaderFooter packet = new PacketPlayOutPlayerListHeaderFooter();
packet.a = (this.playerListHeader == null) ? new ChatComponentText("") : this.playerListHeader;
packet.b = (this.playerListFooter == null) ? new ChatComponentText("") : this.playerListFooter;
packet.header = (this.playerListHeader == null) ? new ChatComponentText("") : this.playerListHeader;
packet.footer = (this.playerListFooter == null) ? new ChatComponentText("") : this.playerListFooter;
getHandle().playerConnection.sendPacket(packet);
}