Azimkin/CraftBukkit
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

SPIGOT-7530, #1313: Add Player#removeResourcePack

Browse Source
This commit is contained in:
Doc 2023-12-13 07:33:49 +11:00 committed by md_5
parent 492dd80ce7
commit c00438b394
No known key found for this signature in database
GPG Key ID: E8E901AC7C617C11
1 changed files with 15 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
View File

@ -43,6 +43,7 @@ import net.minecraft.network.chat.IChatBaseComponent;
import net.minecraft.network.chat.PlayerChatMessage;
import net.minecraft.network.protocol.Packet;
import net.minecraft.network.protocol.common.ClientboundCustomPayloadPacket;
import net.minecraft.network.protocol.common.ClientboundResourcePackPopPacket;
import net.minecraft.network.protocol.common.ClientboundResourcePackPushPacket;
import net.minecraft.network.protocol.common.custom.CustomPacketPayload;
import net.minecraft.network.protocol.game.ClientboundClearTitlesPacket;
@ -913,7 +914,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
}
if (entity.connection == null) {
return false;
return false;
}
if (entity.isVehicle()) {
@ -1735,6 +1736,19 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
}
}
@Override
public void removeResourcePack(UUID id) {
Preconditions.checkArgument(id != null, "Resource pack id cannot be null");
if (getHandle().connection == null) return;
getHandle().connection.send(new ClientboundResourcePackPopPacket(Optional.of(id)));
}
@Override
public void removeResourcePacks() {
if (getHandle().connection == null) return;
getHandle().connection.send(new ClientboundResourcePackPopPacket(Optional.empty()));
}
public void addChannel(String channel) {
Preconditions.checkState(channels.size() < 128, "Cannot register channel '%s'. Too many channels registered!", channel);
channel = StandardMessenger.validateAndCorrectChannel(channel);