mirror of
				https://github.com/IntellectualSites/PlotSquared.git
				synced 2025-10-31 01:23:44 +01:00 
			
		
		
		
	Compare commits
	
		
			1 Commits
		
	
	
		
			fix/plotMu
			...
			fix/miniMe
		
	
	| Author | SHA1 | Date | |
|---|---|---|---|
|   | a64a686218 | 
| @@ -40,7 +40,6 @@ import io.papermc.lib.PaperLib; | |||||||
| import net.kyori.adventure.audience.Audience; | import net.kyori.adventure.audience.Audience; | ||||||
| import org.bukkit.GameMode; | import org.bukkit.GameMode; | ||||||
| import org.bukkit.Sound; | import org.bukkit.Sound; | ||||||
| import org.bukkit.SoundCategory; |  | ||||||
| import org.bukkit.WeatherType; | import org.bukkit.WeatherType; | ||||||
| import org.bukkit.entity.Player; | import org.bukkit.entity.Player; | ||||||
| import org.bukkit.event.Event; | import org.bukkit.event.Event; | ||||||
| @@ -52,6 +51,7 @@ import org.bukkit.potion.PotionEffectType; | |||||||
| import org.checkerframework.checker.index.qual.NonNegative; | import org.checkerframework.checker.index.qual.NonNegative; | ||||||
| import org.checkerframework.checker.nullness.qual.NonNull; | import org.checkerframework.checker.nullness.qual.NonNull; | ||||||
|  |  | ||||||
|  | import java.util.Arrays; | ||||||
| import java.util.Set; | import java.util.Set; | ||||||
| import java.util.UUID; | import java.util.UUID; | ||||||
|  |  | ||||||
| @@ -309,21 +309,18 @@ public class BukkitPlayer extends PlotPlayer<Player> { | |||||||
|     @Override |     @Override | ||||||
|     public void playMusic(final @NonNull Location location, final @NonNull ItemType id) { |     public void playMusic(final @NonNull Location location, final @NonNull ItemType id) { | ||||||
|         if (id == ItemTypes.AIR) { |         if (id == ItemTypes.AIR) { | ||||||
|             if (PlotSquared.platform().serverVersion()[1] >= 19) { |             // Let's just stop all the discs because why not? | ||||||
|                 player.stopSound(SoundCategory.MUSIC); |             for (final Sound sound : Arrays.stream(Sound.values()) | ||||||
|                 return; |                     .filter(sound -> sound.name().contains("DISC")).toList()) { | ||||||
|  |                 player.stopSound(sound); | ||||||
|             } |             } | ||||||
|             // 1.18 and downwards require a specific Sound to stop (even tho the packet does not??) |             // this.player.playEffect(BukkitUtil.getLocation(location), Effect.RECORD_PLAY, Material.AIR); | ||||||
|             for (final Sound sound : Sound.values()) { |         } else { | ||||||
|                 if (sound.name().startsWith("MUSIC_DISC")) { |             // this.player.playEffect(BukkitUtil.getLocation(location), Effect.RECORD_PLAY, id.to(Material.class)); | ||||||
|                     this.player.stopSound(sound, SoundCategory.MUSIC); |             this.player.playSound(BukkitUtil.adapt(location), | ||||||
|                 } |                     Sound.valueOf(BukkitAdapter.adapt(id).name()), Float.MAX_VALUE, 1f | ||||||
|             } |             ); | ||||||
|             return; |  | ||||||
|         } |         } | ||||||
|         this.player.playSound(BukkitUtil.adapt(location), Sound.valueOf(BukkitAdapter.adapt(id).name()), |  | ||||||
|                 SoundCategory.MUSIC, 1f, 1f |  | ||||||
|         ); |  | ||||||
|     } |     } | ||||||
|  |  | ||||||
|     @SuppressWarnings("deprecation") // Needed for Spigot compatibility |     @SuppressWarnings("deprecation") // Needed for Spigot compatibility | ||||||
|   | |||||||
| @@ -2401,8 +2401,7 @@ public class SQLManager implements AbstractDB { | |||||||
|         addPlotTask(plot, new UniqueStatement("setPosition") { |         addPlotTask(plot, new UniqueStatement("setPosition") { | ||||||
|             @Override |             @Override | ||||||
|             public void set(PreparedStatement statement) throws SQLException { |             public void set(PreparedStatement statement) throws SQLException { | ||||||
|                 // Please see the table creation statement. There is the default value of "default" |                 statement.setString(1, position == null ? "" : position); | ||||||
|                 statement.setString(1, position == null ? "DEFAULT" : position); |  | ||||||
|                 statement.setInt(2, getId(plot)); |                 statement.setInt(2, getId(plot)); | ||||||
|             } |             } | ||||||
|  |  | ||||||
|   | |||||||
| @@ -1483,7 +1483,7 @@ public class Plot { | |||||||
|      */ |      */ | ||||||
|     public void setHome(BlockLoc location) { |     public void setHome(BlockLoc location) { | ||||||
|         Plot plot = this.getBasePlot(false); |         Plot plot = this.getBasePlot(false); | ||||||
|         if (location != null && (BlockLoc.ZERO.equals(location) || BlockLoc.MINY.equals(location))) { |         if (BlockLoc.ZERO.equals(location) || BlockLoc.MINY.equals(location)) { | ||||||
|             return; |             return; | ||||||
|         } |         } | ||||||
|         plot.getSettings().setPosition(location); |         plot.getSettings().setPosition(location); | ||||||
|   | |||||||
| @@ -13,7 +13,7 @@ log4j = "2.19.0" | |||||||
|  |  | ||||||
| # Plugins | # Plugins | ||||||
| worldedit = "7.2.18" | worldedit = "7.2.18" | ||||||
| fawe = "2.8.4" | fawe = "2.8.3" | ||||||
| placeholderapi = "2.11.5" | placeholderapi = "2.11.5" | ||||||
| luckperms = "5.4" | luckperms = "5.4" | ||||||
| essentialsx = "2.20.1" | essentialsx = "2.20.1" | ||||||
|   | |||||||
		Reference in New Issue
	
	Block a user