From 7e6d0bd5317e4cb2d8f786e508a99df78db9764a Mon Sep 17 00:00:00 2001 From: Bukkit/Spigot Date: Mon, 28 Mar 2011 17:15:41 -0700 Subject: [PATCH] fixed PlayerCommandPreprocessEvent inheritance By: sunkid --- .../java/org/bukkit/event/player/PlayerChatEvent.java | 10 +++++++--- .../event/player/PlayerCommandPreprocessEvent.java | 4 ++-- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/paper-api/src/main/java/org/bukkit/event/player/PlayerChatEvent.java b/paper-api/src/main/java/org/bukkit/event/player/PlayerChatEvent.java index 320f00b4f6..ad33abc74d 100644 --- a/paper-api/src/main/java/org/bukkit/event/player/PlayerChatEvent.java +++ b/paper-api/src/main/java/org/bukkit/event/player/PlayerChatEvent.java @@ -4,6 +4,7 @@ package org.bukkit.event.player; import java.util.Arrays; import java.util.HashSet; import java.util.Set; + import org.bukkit.entity.Player; import org.bukkit.event.Cancellable; @@ -17,10 +18,13 @@ public class PlayerChatEvent extends PlayerEvent implements Cancellable { private final Set recipients; public PlayerChatEvent(final Player player, final String message) { - super(Type.PLAYER_CHAT, player); - this.message = message; - + this(Type.PLAYER_CHAT, player, message); + } + + protected PlayerChatEvent(final Type type, final Player player, final String message) { + super(type, player); recipients = new HashSet(Arrays.asList(player.getServer().getOnlinePlayers())); + this.message = message; } /** diff --git a/paper-api/src/main/java/org/bukkit/event/player/PlayerCommandPreprocessEvent.java b/paper-api/src/main/java/org/bukkit/event/player/PlayerCommandPreprocessEvent.java index 3f061a3ac4..0f203bed33 100644 --- a/paper-api/src/main/java/org/bukkit/event/player/PlayerCommandPreprocessEvent.java +++ b/paper-api/src/main/java/org/bukkit/event/player/PlayerCommandPreprocessEvent.java @@ -3,7 +3,7 @@ package org.bukkit.event.player; import org.bukkit.entity.Player; public class PlayerCommandPreprocessEvent extends PlayerChatEvent { - public PlayerCommandPreprocessEvent(Player player, String message) { - super(player, message); + public PlayerCommandPreprocessEvent(final Player player, final String message) { + super(Type.PLAYER_COMMAND_PREPROCESS, player, message); } }