OpenSource/PaperMC
OpenSource/PaperMC
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2024-12-29 07:48:53 +01:00
Code Issues Projects Releases Packages Wiki Activity

SPIGOT-5098: Add a method to allow colored sign changes

Browse source
This commit is contained in:
Yannick Lamprecht 2019-06-22 16:22:53 +02:00 committed by md_5
parent 533290e290
commit 8a3d3f4980
1 changed files with 9 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
View file

@ -36,6 +36,7 @@ import net.minecraft.server.Entity;
import net.minecraft.server.EntityLiving; import net.minecraft.server.EntityLiving;
import net.minecraft.server.EntityPlayer; import net.minecraft.server.EntityPlayer;
import net.minecraft.server.EnumChatFormat; import net.minecraft.server.EnumChatFormat;
import net.minecraft.server.EnumColor;
import net.minecraft.server.EnumGamemode; import net.minecraft.server.EnumGamemode;
import net.minecraft.server.IChatBaseComponent; import net.minecraft.server.IChatBaseComponent;
import net.minecraft.server.MapIcon; import net.minecraft.server.MapIcon;
@ -68,6 +69,7 @@ import org.apache.commons.lang.Validate;
import org.bukkit.Achievement; import org.bukkit.Achievement;
import org.bukkit.BanList; import org.bukkit.BanList;
import org.bukkit.Bukkit; import org.bukkit.Bukkit;
import org.bukkit.DyeColor;
import org.bukkit.Effect; import org.bukkit.Effect;
import org.bukkit.GameMode; import org.bukkit.GameMode;
import org.bukkit.Instrument; import org.bukkit.Instrument;
@ -523,6 +525,11 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@Override @Override
public void sendSignChange(Location loc, String[] lines) { public void sendSignChange(Location loc, String[] lines) {
sendSignChange(loc, lines, DyeColor.BLACK);
}
@Override
public void sendSignChange(Location loc, String[] lines, DyeColor dyeColor) {
if (getHandle().playerConnection == null) { if (getHandle().playerConnection == null) {
return; return;
} }
@ -532,6 +539,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
} }
Validate.notNull(loc, "Location can not be null"); Validate.notNull(loc, "Location can not be null");
Validate.notNull(dyeColor, "DyeColor can not be null");
if (lines.length < 4) { if (lines.length < 4) {
throw new IllegalArgumentException("Must have at least 4 lines"); throw new IllegalArgumentException("Must have at least 4 lines");
} }
@ -539,6 +547,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
IChatBaseComponent[] components = CraftSign.sanitizeLines(lines); IChatBaseComponent[] components = CraftSign.sanitizeLines(lines);
TileEntitySign sign = new TileEntitySign(); TileEntitySign sign = new TileEntitySign();
sign.setPosition(new BlockPosition(loc.getBlockX(), loc.getBlockY(), loc.getBlockZ())); sign.setPosition(new BlockPosition(loc.getBlockX(), loc.getBlockY(), loc.getBlockZ()));
sign.setColor(EnumColor.fromColorIndex(dyeColor.getWoolData()));
System.arraycopy(components, 0, sign.lines, 0, sign.lines.length); System.arraycopy(components, 0, sign.lines, 0, sign.lines.length);
getHandle().playerConnection.sendPacket(sign.getUpdatePacket()); getHandle().playerConnection.sendPacket(sign.getUpdatePacket());