Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Can get permissions of original casing with .getExactPermission() in …
…PermissionAttachmentInfo
- Loading branch information
Showing
18 changed files
with
337 additions
and
344 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
2 changes: 0 additions & 2 deletions
2
src/main/java/org/bukkit/conversations/ConversationPrefix.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
1 change: 0 additions & 1 deletion
1
src/main/java/org/bukkit/conversations/InactivityConversationCanceller.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,6 +1,5 @@ | ||
| package org.bukkit.conversations; | ||
|
|
||
| import org.bukkit.Server; | ||
| import org.bukkit.plugin.Plugin; | ||
|
|
||
| /** | ||
|
|
||
2 changes: 0 additions & 2 deletions
2
src/main/java/org/bukkit/conversations/NullConversationPrefix.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
1 change: 0 additions & 1 deletion
1
src/main/java/org/bukkit/conversations/PluginNameConversationPrefix.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
138 changes: 69 additions & 69 deletions
138
src/main/java/org/bukkit/event/entity/ExpBottleEvent.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,69 +1,69 @@ | ||
| package org.bukkit.event.entity; | ||
|
|
||
| import org.bukkit.entity.ThrownExpBottle; | ||
| import org.bukkit.event.HandlerList; | ||
|
|
||
| /** | ||
| * Called when a ThrownExpBottle hits and releases experience. | ||
| */ | ||
| public class ExpBottleEvent extends ProjectileHitEvent { | ||
| private static final HandlerList handlers = new HandlerList(); | ||
| private int exp; | ||
| private boolean showEffect = true; | ||
|
|
||
| public ExpBottleEvent(final ThrownExpBottle bottle, final int exp) { | ||
| super(bottle); | ||
| this.exp = exp; | ||
| } | ||
|
|
||
| @Override | ||
| public ThrownExpBottle getEntity() { | ||
| return (ThrownExpBottle) entity; | ||
| } | ||
|
|
||
| /** | ||
| * This method indicates if the particle effect should be shown. | ||
| * @return true if the effect will be shown, false otherwise | ||
| */ | ||
| public boolean getShowEffect() { | ||
| return this.showEffect; | ||
| } | ||
|
|
||
| /** | ||
| * This method sets if the particle effect will be shown. | ||
| * This does not change the experience created. | ||
| * @param showEffect | ||
| * true indicates the effect will be shown, | ||
| * false indicates no effect will be shown | ||
| */ | ||
| public void setShowEffect(final boolean showEffect) { | ||
| this.showEffect = showEffect; | ||
| } | ||
|
|
||
| /** | ||
| * This method retrieves the amount of experience to be created. | ||
| * The number indicates a total amount to be divided into orbs. | ||
| * @return the total amount of experience to be created | ||
| */ | ||
| public int getExperience() { | ||
| return exp; | ||
| } | ||
|
|
||
| /** | ||
| * This method sets the amount of experience to be created. | ||
| * The number indicates a total amount to be divided into orbs. | ||
| * @param exp the total amount of experience to be created | ||
| */ | ||
| public void setExperience(final int exp) { | ||
| this.exp = exp; | ||
| } | ||
|
|
||
| @Override | ||
| public HandlerList getHandlers() { | ||
| return handlers; | ||
| } | ||
|
|
||
| public static HandlerList getHandlerList() { | ||
| return handlers; | ||
| } | ||
| } | ||
| package org.bukkit.event.entity; | ||
|
|
||
| import org.bukkit.entity.ThrownExpBottle; | ||
| import org.bukkit.event.HandlerList; | ||
|
|
||
| /** | ||
| * Called when a ThrownExpBottle hits and releases experience. | ||
| */ | ||
| public class ExpBottleEvent extends ProjectileHitEvent { | ||
| private static final HandlerList handlers = new HandlerList(); | ||
| private int exp; | ||
| private boolean showEffect = true; | ||
|
|
||
| public ExpBottleEvent(final ThrownExpBottle bottle, final int exp) { | ||
| super(bottle); | ||
| this.exp = exp; | ||
| } | ||
|
|
||
| @Override | ||
| public ThrownExpBottle getEntity() { | ||
| return (ThrownExpBottle) entity; | ||
| } | ||
|
|
||
| /** | ||
| * This method indicates if the particle effect should be shown. | ||
| * @return true if the effect will be shown, false otherwise | ||
| */ | ||
| public boolean getShowEffect() { | ||
| return this.showEffect; | ||
| } | ||
|
|
||
| /** | ||
| * This method sets if the particle effect will be shown. | ||
| * This does not change the experience created. | ||
| * @param showEffect | ||
| * true indicates the effect will be shown, | ||
| * false indicates no effect will be shown | ||
| */ | ||
| public void setShowEffect(final boolean showEffect) { | ||
| this.showEffect = showEffect; | ||
| } | ||
|
|
||
| /** | ||
| * This method retrieves the amount of experience to be created. | ||
| * The number indicates a total amount to be divided into orbs. | ||
| * @return the total amount of experience to be created | ||
| */ | ||
| public int getExperience() { | ||
| return exp; | ||
| } | ||
|
|
||
| /** | ||
| * This method sets the amount of experience to be created. | ||
| * The number indicates a total amount to be divided into orbs. | ||
| * @param exp the total amount of experience to be created | ||
| */ | ||
| public void setExperience(final int exp) { | ||
| this.exp = exp; | ||
| } | ||
|
|
||
| @Override | ||
| public HandlerList getHandlers() { | ||
| return handlers; | ||
| } | ||
|
|
||
| public static HandlerList getHandlerList() { | ||
| return handlers; | ||
| } | ||
| } |
186 changes: 93 additions & 93 deletions
186
src/main/java/org/bukkit/event/entity/PotionSplashEvent.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,93 +1,93 @@ | ||
| package org.bukkit.event.entity; | ||
|
|
||
| import java.util.ArrayList; | ||
| import java.util.Collection; | ||
| import java.util.Map; | ||
|
|
||
| import org.apache.commons.lang.Validate; | ||
| import org.bukkit.entity.LivingEntity; | ||
| import org.bukkit.entity.ThrownPotion; | ||
| import org.bukkit.event.Cancellable; | ||
| import org.bukkit.event.HandlerList; | ||
|
|
||
| /** | ||
| * Called when a splash potion hits an area | ||
| */ | ||
| public class PotionSplashEvent extends ProjectileHitEvent implements Cancellable { | ||
| private static final HandlerList handlers = new HandlerList(); | ||
| private boolean cancelled; | ||
| private final Map<LivingEntity, Double> affectedEntities; | ||
|
|
||
| public PotionSplashEvent(final ThrownPotion potion, final Map<LivingEntity, Double> affectedEntities) { | ||
| super(potion); | ||
|
|
||
| this.affectedEntities = affectedEntities; | ||
| } | ||
|
|
||
| @Override | ||
| public ThrownPotion getEntity() { | ||
| return (ThrownPotion) entity; | ||
| } | ||
|
|
||
| /** | ||
| * Gets the potion which caused this event | ||
| * | ||
| * @return The thrown potion entity | ||
| */ | ||
| public ThrownPotion getPotion() { | ||
| return (ThrownPotion) getEntity(); | ||
| } | ||
|
|
||
| /** | ||
| * Retrieves a list of all effected entities | ||
| * | ||
| * @return A fresh copy of the affected entity list | ||
| */ | ||
| public Collection<LivingEntity> getAffectedEntities() { | ||
| return new ArrayList<LivingEntity>(affectedEntities.keySet()); | ||
| } | ||
|
|
||
| /** | ||
| * Gets the intensity of the potion's effects for given entity; | ||
| * This depends on the distance to the impact center | ||
| * | ||
| * @param entity Which entity to get intensity for | ||
| * @return intensity relative to maximum effect; 0.0: not affected; 1.0: fully hit by potion effects | ||
| */ | ||
| public double getIntensity(LivingEntity entity) { | ||
| Double intensity = affectedEntities.get(entity); | ||
| return intensity != null ? intensity : 0.0; | ||
| } | ||
|
|
||
| /** | ||
| * Overwrites the intensity for a given entity | ||
| * | ||
| * @param entity For which entity to define a new intensity | ||
| * @param intensity relative to maximum effect | ||
| */ | ||
| public void setIntensity(LivingEntity entity, double intensity) { | ||
| Validate.notNull(entity, "You must specify a valid entity."); | ||
| if (intensity <= 0.0) { | ||
| affectedEntities.remove(entity); | ||
| } else { | ||
| affectedEntities.put(entity, Math.min(intensity, 1.0)); | ||
| } | ||
| } | ||
|
|
||
| public boolean isCancelled() { | ||
| return cancelled; | ||
| } | ||
|
|
||
| public void setCancelled(boolean cancel) { | ||
| cancelled = cancel; | ||
| } | ||
|
|
||
| @Override | ||
| public HandlerList getHandlers() { | ||
| return handlers; | ||
| } | ||
|
|
||
| public static HandlerList getHandlerList() { | ||
| return handlers; | ||
| } | ||
| } | ||
| package org.bukkit.event.entity; | ||
|
|
||
| import java.util.ArrayList; | ||
| import java.util.Collection; | ||
| import java.util.Map; | ||
|
|
||
| import org.apache.commons.lang.Validate; | ||
| import org.bukkit.entity.LivingEntity; | ||
| import org.bukkit.entity.ThrownPotion; | ||
| import org.bukkit.event.Cancellable; | ||
| import org.bukkit.event.HandlerList; | ||
|
|
||
| /** | ||
| * Called when a splash potion hits an area | ||
| */ | ||
| public class PotionSplashEvent extends ProjectileHitEvent implements Cancellable { | ||
| private static final HandlerList handlers = new HandlerList(); | ||
| private boolean cancelled; | ||
| private final Map<LivingEntity, Double> affectedEntities; | ||
|
|
||
| public PotionSplashEvent(final ThrownPotion potion, final Map<LivingEntity, Double> affectedEntities) { | ||
| super(potion); | ||
|
|
||
| this.affectedEntities = affectedEntities; | ||
| } | ||
|
|
||
| @Override | ||
| public ThrownPotion getEntity() { | ||
| return (ThrownPotion) entity; | ||
| } | ||
|
|
||
| /** | ||
| * Gets the potion which caused this event | ||
| * | ||
| * @return The thrown potion entity | ||
| */ | ||
| public ThrownPotion getPotion() { | ||
| return (ThrownPotion) getEntity(); | ||
| } | ||
|
|
||
| /** | ||
| * Retrieves a list of all effected entities | ||
| * | ||
| * @return A fresh copy of the affected entity list | ||
| */ | ||
| public Collection<LivingEntity> getAffectedEntities() { | ||
| return new ArrayList<LivingEntity>(affectedEntities.keySet()); | ||
| } | ||
|
|
||
| /** | ||
| * Gets the intensity of the potion's effects for given entity; | ||
| * This depends on the distance to the impact center | ||
| * | ||
| * @param entity Which entity to get intensity for | ||
| * @return intensity relative to maximum effect; 0.0: not affected; 1.0: fully hit by potion effects | ||
| */ | ||
| public double getIntensity(LivingEntity entity) { | ||
| Double intensity = affectedEntities.get(entity); | ||
| return intensity != null ? intensity : 0.0; | ||
| } | ||
|
|
||
| /** | ||
| * Overwrites the intensity for a given entity | ||
| * | ||
| * @param entity For which entity to define a new intensity | ||
| * @param intensity relative to maximum effect | ||
| */ | ||
| public void setIntensity(LivingEntity entity, double intensity) { | ||
| Validate.notNull(entity, "You must specify a valid entity."); | ||
| if (intensity <= 0.0) { | ||
| affectedEntities.remove(entity); | ||
| } else { | ||
| affectedEntities.put(entity, Math.min(intensity, 1.0)); | ||
| } | ||
| } | ||
|
|
||
| public boolean isCancelled() { | ||
| return cancelled; | ||
| } | ||
|
|
||
| public void setCancelled(boolean cancel) { | ||
| cancelled = cancel; | ||
| } | ||
|
|
||
| @Override | ||
| public HandlerList getHandlers() { | ||
| return handlers; | ||
| } | ||
|
|
||
| public static HandlerList getHandlerList() { | ||
| return handlers; | ||
| } | ||
| } |
Oops, something went wrong.