Lukas A / Spigot / cf6dea390f8

Commits

md_5 authored cf6dea390f8 12 Jul 2016

TileEntitySkull goes back

Tags

No tags

ee1fc06e359

master

Download source

CraftBukkit-Patches/0003-mc-dev-imports.patch

Modified

--
+From 2b87fb80d1c6feb442c3d029672c28d0c1fa4824 Mon Sep 17 00:00:00 2001
-+
+From c2c4378d7d78148502d76b9ba476ff4db2499310 Mon Sep 17 00:00:00 2001
-2
+From: md_5 <md_5@live.com.au>
-3
+Date: Sun, 1 Dec 2013 15:10:48 +1100
-4
+Subject: [PATCH] mc-dev imports
-5
-6
+Imported files which are only modified by Spigot, not upstream. Files here should be completely unmodified aside from trivial changes such as adding throws statements to ensure proper compilation. You may need to add unrelated files in order to ensure a compilable result in the face of synthetic methods.
-7
-8
+diff --git a/src/main/java/net/minecraft/server/AttributeRanged.java b/src/main/java/net/minecraft/server/AttributeRanged.java
-9
+new file mode 100644
-10
+index 0000000..130597c
-11
+--- /dev/null
-1494
++            }
-1495
++        }
-1496
++
-1497
++        entityplayer.playerConnection.sendPacket(new PacketPlayOutStatistic(hashmap));
-1498
++    }
-1499
++
-1500
++    public boolean e() {
-1501
++        return this.g;
-1502
++    }
-1503
++}
-+
+diff --git a/src/main/java/net/minecraft/server/TileEntitySkull.java b/src/main/java/net/minecraft/server/TileEntitySkull.java
-+
+new file mode 100644
-+
+index 0000000..4ae6796
-+
+--- /dev/null
-+
++++ b/src/main/java/net/minecraft/server/TileEntitySkull.java
-+
+@@ -0,0 +1,152 @@
-+
++package net.minecraft.server;
 +
-+
++import com.google.common.collect.Iterables;
-+
++import com.mojang.authlib.GameProfile;
-+
++import com.mojang.authlib.minecraft.MinecraftSessionService;
-+
++import com.mojang.authlib.properties.Property;
-+
++import java.util.UUID;
-+
++import javax.annotation.Nullable;
 +
-+
++public class TileEntitySkull extends TileEntity implements ITickable {
 +
-+
++    private int a;
-+
++    public int rotation;
-+
++    private GameProfile g;
-+
++    private int h;
-+
++    private boolean i;
-+
++    private static UserCache j;
-+
++    private static MinecraftSessionService k;
 +
-+
++    public TileEntitySkull() {}
 +
-+
++    public static void a(UserCache usercache) {
-+
++        TileEntitySkull.j = usercache;
-+
++    }
 +
-+
++    public static void a(MinecraftSessionService minecraftsessionservice) {
-+
++        TileEntitySkull.k = minecraftsessionservice;
-+
++    }
 +
-+
++    public NBTTagCompound save(NBTTagCompound nbttagcompound) {
-+
++        super.save(nbttagcompound);
-+
++        nbttagcompound.setByte("SkullType", (byte) (this.a & 255));
-+
++        nbttagcompound.setByte("Rot", (byte) (this.rotation & 255));
-+
++        if (this.g != null) {
-+
++            NBTTagCompound nbttagcompound1 = new NBTTagCompound();
 +
-+
++            GameProfileSerializer.serialize(nbttagcompound1, this.g);
-+
++            nbttagcompound.set("Owner", nbttagcompound1);
-+
++        }
 +
-+
++        return nbttagcompound;
-+
++    }
 +
-+
++    public void a(NBTTagCompound nbttagcompound) {
-+
++        super.a(nbttagcompound);
-+
++        this.a = nbttagcompound.getByte("SkullType");
-+
++        this.rotation = nbttagcompound.getByte("Rot");
-+
++        if (this.a == 3) {
-+
++            if (nbttagcompound.hasKeyOfType("Owner", 10)) {
-+
++                this.g = GameProfileSerializer.deserialize(nbttagcompound.getCompound("Owner"));
-+
++            } else if (nbttagcompound.hasKeyOfType("ExtraType", 8)) {
-+
++                String s = nbttagcompound.getString("ExtraType");
 +
-+
++                if (!UtilColor.b(s)) {
-+
++                    this.g = new GameProfile((UUID) null, s);
-+
++                    this.h();
-+
++                }
-+
++            }
-+
++        }
 +
-+
++    }
 +
-+
++    public void E_() {
-+
++        if (this.a == 5) {
-+
++            if (this.world.isBlockIndirectlyPowered(this.position)) {
-+
++                this.i = true;
-+
++                ++this.h;
-+
++            } else {
-+
++                this.i = false;
-+
++            }
-+
++        }
 +
-+
++    }
 +
-+
++    @Nullable
-+
++    public GameProfile getGameProfile() {
-+
++        return this.g;
-+
++    }
 +
-+
++    @Nullable
-+
++    public PacketPlayOutTileEntityData getUpdatePacket() {
-+
++        return new PacketPlayOutTileEntityData(this.position, 4, this.c());
-+
++    }
 +
-+
++    public NBTTagCompound c() {
-+
++        return this.save(new NBTTagCompound());
-+
++    }
 +
-+
++    public void setSkullType(int i) {
-+
++        this.a = i;
-+
++        this.g = null;
-+
++    }
 +
-+
++    public void setGameProfile(@Nullable GameProfile gameprofile) {
-+
++        this.a = 3;
-+
++        this.g = gameprofile;
-+
++        this.h();
-+
++    }
 +
-+
++    private void h() {
-+
++        this.g = b(this.g);
-+
++        this.update();
-+
++    }
 +
-+
++    public static GameProfile b(GameProfile gameprofile) {
-+
++        if (gameprofile != null && !UtilColor.b(gameprofile.getName())) {
-+
++            if (gameprofile.isComplete() && gameprofile.getProperties().containsKey("textures")) {
-+
++                return gameprofile;
-+
++            } else if (TileEntitySkull.j != null && TileEntitySkull.k != null) {
-+
++                GameProfile gameprofile1 = TileEntitySkull.j.getProfile(gameprofile.getName());
 +
-+
++                if (gameprofile1 == null) {
-+
++                    return gameprofile;
-+
++                } else {
-+
++                    Property property = (Property) Iterables.getFirst(gameprofile1.getProperties().get("textures"), (Object) null);
 +
-+
++                    if (property == null) {
-+
++                        gameprofile1 = TileEntitySkull.k.fillProfileProperties(gameprofile1, true);
-+
++                    }
 +
-+
++                    return gameprofile1;
-+
++                }
-+
++            } else {
-+
++                return gameprofile;
-+
++            }
-+
++        } else {
-+
++            return gameprofile;
-+
++        }
-+
++    }
 +
-+
++    public int getSkullType() {
-+
++        return this.a;
-+
++    }
 +
-+
++    public void setRotation(int i) {
-+
++        this.rotation = i;
-+
++    }
 +
-+
++    public void a(EnumBlockMirror enumblockmirror) {
-+
++        if (this.world != null && this.world.getType(this.getPosition()).get(BlockSkull.FACING) == EnumDirection.UP) {
-+
++            this.rotation = enumblockmirror.a(this.rotation, 16);
-+
++        }
 +
-+
++    }
 +
-+
++    public void a(EnumBlockRotation enumblockrotation) {
-+
++        if (this.world != null && this.world.getType(this.getPosition()).get(BlockSkull.FACING) == EnumDirection.UP) {
-+
++            this.rotation = enumblockrotation.a(this.rotation, 16);
-+
++        }
 +
-+
++    }
-+
++}
-1662
+diff --git a/src/main/java/net/minecraft/server/WorldGenLargeFeature.java b/src/main/java/net/minecraft/server/WorldGenLargeFeature.java
-1663
+new file mode 100644
-1664
+index 0000000..8ceac26
-1665
+--- /dev/null
-1666
++++ b/src/main/java/net/minecraft/server/WorldGenLargeFeature.java
-1667
+@@ -0,0 +1,139 @@
-1668
++package net.minecraft.server;
-1669
++
-1670
++import com.google.common.collect.Lists;
-1671
++import java.util.Arrays;

Spigot

Commits

Jira Issues

Add shortcut