mirror of
				https://github.com/IntellectualSites/PlotSquared.git
				synced 2025-11-04 03:03:43 +01:00 
			
		
		
		
	Compare commits
	
		
			1 Commits
		
	
	
		
			fix/consis
			...
			fix/add-mi
		
	
	| Author | SHA1 | Date | |
|---|---|---|---|
| 
						 | 
					c90e681aab | 
@@ -152,7 +152,8 @@ public class EntityEventListener implements Listener {
 | 
			
		||||
                }
 | 
			
		||||
            }
 | 
			
		||||
            case "REINFORCEMENTS", "NATURAL", "MOUNT", "PATROL", "RAID", "SHEARED", "SILVERFISH_BLOCK", "ENDER_PEARL",
 | 
			
		||||
                    "TRAP", "VILLAGE_DEFENSE", "VILLAGE_INVASION", "BEEHIVE", "CHUNK_GEN" -> {
 | 
			
		||||
                    "TRAP", "VILLAGE_DEFENSE", "VILLAGE_INVASION", "BEEHIVE", "CHUNK_GEN", "NETHER_PORTAL", "DEFAULT",
 | 
			
		||||
                    "DUPLICATION", "FROZEN", "SPELL" -> {
 | 
			
		||||
                if (!area.isMobSpawning()) {
 | 
			
		||||
                    event.setCancelled(true);
 | 
			
		||||
                    return;
 | 
			
		||||
 
 | 
			
		||||
@@ -1167,7 +1167,7 @@ public class PlayerEventListener implements Listener {
 | 
			
		||||
                    }
 | 
			
		||||
                }
 | 
			
		||||
                if (type.isEdible()) {
 | 
			
		||||
                    //Allow all players to eat while also allowing the block place event to be fired
 | 
			
		||||
                    //Allow all players to eat while also allowing the block place event ot be fired
 | 
			
		||||
                    return;
 | 
			
		||||
                }
 | 
			
		||||
                if (type == Material.ARMOR_STAND) {
 | 
			
		||||
 
 | 
			
		||||
@@ -275,7 +275,7 @@ public class HybridPlotWorld extends ClassicPlotWorld {
 | 
			
		||||
                SCHEM_Y = getMinGenHeight();
 | 
			
		||||
                plotY = 0;
 | 
			
		||||
            } else if (!Settings.Schematics.PASTE_ON_TOP) {
 | 
			
		||||
                SCHEM_Y = getMinGenHeight();
 | 
			
		||||
                SCHEM_Y = getMinBuildHeight();
 | 
			
		||||
                plotY = 0;
 | 
			
		||||
            }
 | 
			
		||||
            maxSchematicHeight = plotY + plotSchemHeight;
 | 
			
		||||
@@ -296,15 +296,20 @@ public class HybridPlotWorld extends ClassicPlotWorld {
 | 
			
		||||
                    // Road is the lowest schematic. Normalize plotY to it.
 | 
			
		||||
                    if (Settings.Schematics.PASTE_ON_TOP) {
 | 
			
		||||
                        plotY = PLOT_HEIGHT - getMinGenHeight();
 | 
			
		||||
                    } else {
 | 
			
		||||
                        plotY = getMinBuildHeight() - getMinGenHeight();
 | 
			
		||||
                    }
 | 
			
		||||
                }
 | 
			
		||||
            } else if (!Settings.Schematics.PASTE_ROAD_ON_TOP) {
 | 
			
		||||
                roadY = 0;
 | 
			
		||||
                SCHEM_Y = getMinGenHeight();
 | 
			
		||||
                if (schematic3 != null) {
 | 
			
		||||
                if (SCHEM_Y == getMinGenHeight()) { // Only possible if plot schematic is enabled
 | 
			
		||||
                    // Plot is still the lowest schematic, normalize roadY to it
 | 
			
		||||
                    roadY = getMinBuildHeight() - getMinGenHeight();
 | 
			
		||||
                } else if (schematic3 != null) {
 | 
			
		||||
                    SCHEM_Y = getMinBuildHeight();
 | 
			
		||||
                    roadY = 0;// Road is the lowest schematic
 | 
			
		||||
                    if (Settings.Schematics.PASTE_ON_TOP) {
 | 
			
		||||
                        // Road is the lowest schematic. Normalize plotY to it.
 | 
			
		||||
                        plotY = PLOT_HEIGHT - SCHEM_Y;
 | 
			
		||||
                        plotY = PLOT_HEIGHT - getMinBuildHeight();
 | 
			
		||||
                    }
 | 
			
		||||
                    maxSchematicHeight = Math.max(maxSchematicHeight, plotY + plotSchemHeight);
 | 
			
		||||
                }
 | 
			
		||||
 
 | 
			
		||||
@@ -529,7 +529,7 @@ public class HybridUtils {
 | 
			
		||||
                Math.min(plotworld.PLOT_HEIGHT, Math.min(plotworld.WALL_HEIGHT, plotworld.ROAD_HEIGHT)) : plotworld.ROAD_HEIGHT;
 | 
			
		||||
        int sx = bot.getX() - plotworld.ROAD_WIDTH + 1;
 | 
			
		||||
        int sz = bot.getZ() + 1;
 | 
			
		||||
        int sy = Settings.Schematics.PASTE_ROAD_ON_TOP ? schemY : plot.getArea().getMinGenHeight();
 | 
			
		||||
        int sy = Settings.Schematics.PASTE_ROAD_ON_TOP ? schemY : plot.getArea().getMinBuildHeight();
 | 
			
		||||
        int ex = bot.getX();
 | 
			
		||||
        int ez = top.getZ();
 | 
			
		||||
        int ey = get_ey(plotworld, queue, sx, ex, sz, ez, sy);
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user