Skip to content

Commit 75bbf4f

Browse files
authored
Fix infinite loop for legacy wrapper (#13659)
1 parent 7e80cef commit 75bbf4f

File tree

2 files changed

+0
-86
lines changed

2 files changed

+0
-86
lines changed

paper-api/src/main/java/org/bukkit/enchantments/EnchantmentWrapper.java

Lines changed: 0 additions & 49 deletions
Original file line numberDiff line numberDiff line change
@@ -20,53 +20,4 @@ protected EnchantmentWrapper() {
2020
public Enchantment getEnchantment() {
2121
return this;
2222
}
23-
// Paper start
24-
@NotNull
25-
@Override
26-
public net.kyori.adventure.text.Component displayName(int level) {
27-
return getEnchantment().displayName(level);
28-
}
29-
30-
@Override
31-
public @NotNull String translationKey() {
32-
return getEnchantment().translationKey();
33-
}
34-
35-
@Override
36-
public boolean isTradeable() {
37-
return getEnchantment().isTradeable();
38-
}
39-
40-
@Override
41-
public boolean isDiscoverable() {
42-
return getEnchantment().isDiscoverable();
43-
}
44-
45-
@Override
46-
public int getMinModifiedCost(int level) {
47-
return getEnchantment().getMinModifiedCost(level);
48-
}
49-
50-
@Override
51-
public int getMaxModifiedCost(int level) {
52-
return getEnchantment().getMaxModifiedCost(level);
53-
}
54-
55-
@NotNull
56-
@Override
57-
public io.papermc.paper.enchantments.EnchantmentRarity getRarity() {
58-
return getEnchantment().getRarity();
59-
}
60-
61-
@Override
62-
public float getDamageIncrease(int level, @NotNull org.bukkit.entity.EntityCategory entityCategory) {
63-
return getEnchantment().getDamageIncrease(level, entityCategory);
64-
}
65-
66-
@NotNull
67-
@Override
68-
public java.util.Set<org.bukkit.inventory.EquipmentSlot> getActiveSlots() {
69-
return getEnchantment().getActiveSlots();
70-
}
71-
// Paper end
7223
}

paper-api/src/main/java/org/bukkit/potion/PotionEffectTypeWrapper.java

Lines changed: 0 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -19,41 +19,4 @@ protected PotionEffectTypeWrapper() {
1919
public PotionEffectType getType() {
2020
return this;
2121
}
22-
23-
@Override
24-
public boolean isInstant() {
25-
return getType().isInstant();
26-
}
27-
28-
@NotNull
29-
@Override
30-
public org.bukkit.Color getColor() {
31-
return getType().getColor();
32-
}
33-
// Paper start
34-
@Override
35-
public @NotNull org.bukkit.NamespacedKey getKey() {
36-
return this.getType().getKey();
37-
}
38-
39-
@Override
40-
public @NotNull java.util.Map<org.bukkit.attribute.Attribute, org.bukkit.attribute.AttributeModifier> getEffectAttributes() {
41-
return this.getType().getEffectAttributes();
42-
}
43-
44-
@Override
45-
public double getAttributeModifierAmount(@NotNull org.bukkit.attribute.Attribute attribute, int effectAmplifier) {
46-
return this.getType().getAttributeModifierAmount(attribute, effectAmplifier);
47-
}
48-
49-
@Override
50-
public @NotNull PotionEffectType.Category getEffectCategory() {
51-
return this.getType().getEffectCategory();
52-
}
53-
54-
@Override
55-
public @NotNull String translationKey() {
56-
return this.getType().translationKey();
57-
}
58-
// Paper end
5922
}

0 commit comments

Comments
 (0)