Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -95,19 +95,19 @@ private ItemStack getSeatItem(ActiveVehicle v, Seat s) {
lore.add("§7Type: §e"+Text.capitalize(s.getType().toString().toLowerCase()));
if(s.getType().equals(SeatType.ENTITY)) {
if(s.isOccupied()) {
lore.add("§7Entity: §e"+Text.capitalize(s.getEntity().getType().name().toLowerCase().replace("_", " ")));
lore.add("§7Passenger: §e"+Text.capitalize(s.getEntity().getType().name().toLowerCase().replace("_", " ")));
lore.add("");
lore.add("§cClick to dismount entity");
lore.add("§cClick to dismount the passenger");
} else {
lore.add("");
lore.add("§aClick to select entity to mount");
lore.add("§aClick to choose a passenger to seat here");
}
}
if(v.hasContainers()) {
Container c = v.getContainerHandler().getBySeat(s.getBone());
if(c != null) {
lore.add("");
lore.add("§7Container: §f"+c.getName());
lore.add("§7Storage: §f"+c.getName());
}
}
m.setLore(lore);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -430,7 +430,9 @@ public void seatInteract(Player p, ActiveVehicle v) {
boolean hasTicket = VehicleTicketItems.inventoryHas(
p, ticketSource.getOwnerData().getTicketId());
if (!VehicleTicketRules.mayOpenSeatMenu(v.getOwnerData(), ticketSource.getOwnerData(), p.getName(), hasTicket)) {
p.sendMessage("§cYou are not on this vehicle's whitelist.");
p.sendMessage(ticketSource.getOwnerData().isTicketsEnabled()
? "§cYou need a ticket to board this vehicle."
: "§cThe owner has not allowed you aboard this vehicle.");
return;
}
// Check if this player was ejected by the owner and is still on cooldown for this vehicle
Expand Down Expand Up @@ -461,7 +463,7 @@ private void handlePendingEntityMount(Player p, Entity entity) {
return;
}
if(!isEntityAllowed(entity, v.getEntitySeatWhitelist())) {
p.sendMessage("§cThat entity is not allowed in this seat");
p.sendMessage("§cThat creature cannot ride in this seat");
return;
}
Seat seat = v.getSeat(seatBone);
Expand All @@ -471,7 +473,7 @@ private void handlePendingEntityMount(Player p, Entity entity) {
}
MountResult mounted = v.addPassenger(entity, seat);
if (mounted == MountResult.MOUNTED) {
p.sendMessage("§aEntity mounted");
p.sendMessage("§aPassenger seated");
return;
}
if (mounted == MountResult.REJECTED) {
Expand Down Expand Up @@ -1250,7 +1252,7 @@ public void seatSelect(InventoryClickEvent e) {
Entity mounted = seat.getEntity();
v.dismountPassenger(mounted, false);
mounted.teleport(p.getLocation());
p.sendMessage("§eEntity dismounted");
p.sendMessage("§ePassenger dismounted");
}
p.closeInventory();
return;
Expand All @@ -1260,7 +1262,7 @@ public void seatSelect(InventoryClickEvent e) {
pendingEntityVehicle.put(p, v);
pendingEntitySeat.put(p, id);
p.closeInventory();
p.sendMessage("§eRight-click an entity to mount it in this seat");
p.sendMessage("§eRight-click a creature to seat it here");
return;
}
if(i.getType().equals(Material.YELLOW_CONCRETE)) {
Expand Down Expand Up @@ -1354,7 +1356,7 @@ public void containerClick(InventoryClickEvent e) {
return;
}
e.setCancelled(true);
e.getWhoClicked().sendMessage("§cThat item is not allowed in this container.");
e.getWhoClicked().sendMessage("§cThat item cannot be stored here.");
}

@EventHandler
Expand All @@ -1377,7 +1379,7 @@ public void containerDrag(InventoryDragEvent e) {
for (int slot : e.getRawSlots()) {
if (slot < topSize) {
e.setCancelled(true);
e.getWhoClicked().sendMessage("§cThat item is not allowed in this container.");
e.getWhoClicked().sendMessage("§cThat item cannot be stored here.");
return;
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -127,7 +127,7 @@ public void mount(Player p, Entity e) {
break;
}
if(!mounted) {
p.sendMessage("§cNo free slots to mount the entity");
p.sendMessage("§cThere is no room to hitch the creature");
}
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -200,7 +200,7 @@ public boolean attach(Player p, ActiveVehicle target) {
return false;
}
if(!target.getBehaviourHandler().isTrain()) {
p.sendMessage("§cTarget vehicle is not a train type");
p.sendMessage("§cThat vehicle is not a train");
return false;
}
TrainHandler handler = target.getBehaviourHandler().getTrainHandler();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -219,7 +219,7 @@ public void load(Player p, ItemStack i, boolean message) {
}
int count = getAmmoAmount();
if(i.getAmount() < count) {
p.sendMessage("§eWeapon needs "+count+" ammo items per reload");
p.sendMessage("§eYou need "+count+" of that ammunition to reload this weapon");
return;
}
if(reloadTime != -1) {
Expand Down
Loading